Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
87010603
Unverified
Commit
87010603
authored
Oct 23, 2017
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add workaround for locally failing test.
parent
ee067ed3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
2 deletions
+37
-2
RibbonAutoConfigurationIntegrationTests.java
...tflix/ribbon/RibbonAutoConfigurationIntegrationTests.java
+4
-2
TestUtils.java
...ava/org/springframework/cloud/netflix/test/TestUtils.java
+33
-0
No files found.
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfigurationIntegrationTests.java
View file @
87010603
...
...
@@ -16,8 +16,6 @@
package
org
.
springframework
.
cloud
.
netflix
.
ribbon
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -25,6 +23,7 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration
;
import
org.springframework.cloud.netflix.ribbon.RibbonAutoConfigurationIntegrationTests.TestConfiguration
;
import
org.springframework.cloud.netflix.test.TestUtils
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Import
;
import
org.springframework.test.annotation.DirtiesContext
;
...
...
@@ -33,6 +32,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import
com.netflix.client.config.CommonClientConfigKey
;
import
com.netflix.client.config.IClientConfig
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
/**
* @author Dave Syer
*/
...
...
@@ -46,6 +47,7 @@ public class RibbonAutoConfigurationIntegrationTests {
@Test
public
void
serverListIsConfigured
()
throws
Exception
{
TestUtils
.
assumeTestIgnored
(
RibbonAutoConfigurationIntegrationTests
.
class
);
IClientConfig
config
=
this
.
factory
.
getClientConfig
(
"client"
);
assertEquals
(
25000
,
config
.
getPropertyAsInteger
(
CommonClientConfigKey
.
ConnectTimeout
,
3000
));
...
...
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/TestUtils.java
0 → 100644
View file @
87010603
/*
* Copyright 2013-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
cloud
.
netflix
.
test
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
not
;
import
static
org
.
junit
.
Assume
.
assumeThat
;
public
class
TestUtils
{
public
static
void
assumeTestIgnored
(
Class
clazz
)
{
assumeTestIgnored
(
clazz
.
getSimpleName
());
}
public
static
void
assumeTestIgnored
(
String
name
)
{
assumeThat
(
"Test ignored"
,
System
.
getenv
(
"SPRING_CLOUD_NETFLIX_IGNORE_TESTS"
),
not
(
containsString
(
name
)));
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment