Merge branch 'master' into develop

alibaba · Jan 17, 2019 · a666658 · a666658
2 parents 5f97909 + 9e652a2
commit a666658
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java
@@ -535,6 +535,7 @@ public void domServeStatus() throws Exception {
                         .appendParam("dom", NamingBase.TEST_DOM_1)
                         .done(),
                 String.class);
+
         Assert.assertTrue(response.getStatusCode().is2xxSuccessful());
 
         JSONObject json = JSON.parseObject(response.getBody());

diff --git a/...nacos/test/naming/ServiceList_ITCase.java → ...ba/nacos/test/naming/ServiceListTest.java b/...nacos/test/naming/ServiceList_ITCase.java → ...ba/nacos/test/naming/ServiceListTest.java
@@ -48,7 +48,7 @@
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = NamingApp.class, properties = {"server.servlet.context-path=/nacos"},
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class ServiceList_ITCase {
+public class ServiceListTest {
 
     private NamingService naming;
 
@@ -92,6 +92,7 @@ public void getSubscribeServices() throws NacosException, InterruptedException {
         Assert.assertTrue(verifyInstanceList(instances, naming.getAllInstances(serviceName)));
         serviceInfoList = naming.getSubscribeServices();
 
+        System.out.println("dfdfdfd = " + serviceInfoList);
         Assert.assertEquals(count+1, serviceInfoList.size());
     }
 
@@ -125,7 +126,6 @@ public void onEvent(Event event) {
 
         naming.deregisterInstance(serviceName, "127.0.0.1", TEST_PORT, "c1");
         naming.deregisterInstance(serviceName, "127.0.0.1", TEST_PORT, "c2");
-        TimeUnit.SECONDS.sleep(5);
 
         Assert.assertEquals(count+1, serviceInfoList.size());
     }