zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ISSUE #243]fix Integration testing too long

Browse Source
This commit is contained in:
mingyixu 2018-12-05 18:56:34 +08:00
parent e15e902975
commit c634ff8da2
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/src/test/java/com/alibaba/nacos/test/naming/DeregisterInstance_ITCase.java
View File

@ -70,10 +70,10 @@ public class DeregisterInstance_ITCase {
naming.registerInstance(serviceName, "127.0.0.1", TEST_PORT); naming.registerInstance(serviceName, "127.0.0.1", TEST_PORT);
naming.registerInstance(serviceName, "127.0.0.2", TEST_PORT); naming.registerInstance(serviceName, "127.0.0.2", TEST_PORT);
TimeUnit.SECONDS.sleep(3);
List<Instance> instances = naming.getAllInstances(serviceName); List<Instance> instances = naming.getAllInstances(serviceName);
verifyInstanceList(instances, 2, serviceName);
instances = naming.getAllInstances(serviceName);
Assert.assertEquals(instances.size(), 2); Assert.assertEquals(instances.size(), 2);
naming.deregisterInstance(serviceName, "127.0.0.1", TEST_PORT); naming.deregisterInstance(serviceName, "127.0.0.1", TEST_PORT);
@ -87,10 +87,9 @@ public class DeregisterInstance_ITCase {
naming.deregisterInstance(serviceName, "127.0.0.2", TEST_PORT); naming.deregisterInstance(serviceName, "127.0.0.2", TEST_PORT);
TimeUnit.SECONDS.sleep(2); TimeUnit.SECONDS.sleep(3);
instances = naming.getAllInstances(serviceName); instances = naming.getAllInstances(serviceName);
Assert.assertEquals(0, instances.size()); Assert.assertEquals(0, instances.size());
} }
@ -109,11 +108,11 @@ public class DeregisterInstance_ITCase {
naming.registerInstance(serviceName, "127.0.0.1", TEST_PORT, "c1"); naming.registerInstance(serviceName, "127.0.0.1", TEST_PORT, "c1");
naming.registerInstance(serviceName, "127.0.0.2", TEST_PORT, "c2"); naming.registerInstance(serviceName, "127.0.0.2", TEST_PORT, "c2");
TimeUnit.SECONDS.sleep(5);
List<Instance> instances; List<Instance> instances;
instances = naming.getAllInstances(serviceName); instances = naming.getAllInstances(serviceName);
verifyInstanceList(instances, 2, serviceName);
instances = naming.getAllInstances(serviceName);
Assert.assertEquals(instances.size(), 2); Assert.assertEquals(instances.size(), 2);
naming.deregisterInstance(serviceName, "127.0.0.1", TEST_PORT, "c1"); naming.deregisterInstance(serviceName, "127.0.0.1", TEST_PORT, "c1");
@ -146,11 +145,11 @@ public class DeregisterInstance_ITCase {
naming.registerInstance(serviceName, "127.0.0.1", TEST_PORT, "c1"); naming.registerInstance(serviceName, "127.0.0.1", TEST_PORT, "c1");
naming.registerInstance(serviceName, "127.0.0.2", TEST_PORT, "c2"); naming.registerInstance(serviceName, "127.0.0.2", TEST_PORT, "c2");
TimeUnit.SECONDS.sleep(5);
List<Instance> instances; List<Instance> instances;
instances = naming.getAllInstances(serviceName); instances = naming.getAllInstances(serviceName);
verifyInstanceList(instances, 2, serviceName);
instances = naming.getAllInstances(serviceName);
Assert.assertEquals(instances.size(), 2); Assert.assertEquals(instances.size(), 2);
naming.deregisterInstance(serviceName, "127.0.0.1", TEST_PORT, "c1"); naming.deregisterInstance(serviceName, "127.0.0.1", TEST_PORT, "c1");
@ -170,6 +169,19 @@ public class DeregisterInstance_ITCase {
Assert.assertEquals(instances.size(), 0); Assert.assertEquals(instances.size(), 0);
} }
public void verifyInstanceList(List<Instance> instances, int size, String serviceName) throws Exception {
int i = 0;
while ( i < 20 ) {
instances = naming.getAllInstances(serviceName);
if (instances.size() == size) {
break;
} else {
TimeUnit.SECONDS.sleep(3);
i++;
}
}
}
} }