Add workaround for locally failing test.

parent ee067ed3
......@@ -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));
......
/*
* 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)));
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment