Merge branch '2.2.x'

This commit is contained in:
spencergibb
2020-07-06 17:57:50 -04:00
5 changed files with 11 additions and 4 deletions

View File

@@ -18,6 +18,7 @@ package org.springframework.cloud.consul.serviceregistry;
import com.ecwid.consul.ConsulException;
import com.ecwid.consul.v1.ConsulClient;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -43,6 +44,7 @@ public class ConsulAutoServiceRegistrationFailFastTests {
@Rule
public ExpectedException exception = ExpectedException.none();
@Ignore
@Test
public void testFailFastEnabled() {
this.exception.expectCause(isA(ConsulException.class));

View File

@@ -19,6 +19,7 @@ package org.springframework.cloud.consul.serviceregistry;
import com.ecwid.consul.ConsulException;
import com.ecwid.consul.v1.ConsulClient;
import org.hamcrest.Matchers;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -49,6 +50,7 @@ public class ConsulAutoServiceRegistrationRetryTests {
@Rule
public OutputCaptureRule output = new OutputCaptureRule();
@Ignore
@Test
public void testRetry() {
this.exception.expectCause(isA(ConsulException.class));