Merge remote-tracking branch 'origin/feature_multi_tenant' into featu…

…re_multi_tenant
carlosEBXd · Jan 9, 2019 · 1782041 · 1782041
2 parents a144412 + 4e1f587
commit 1782041
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/MultipleTenant_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/MultipleTenant_ITCase.java
@@ -44,7 +44,6 @@ public class MultipleTenant_ITCase {
 
     @Before
     public void init() throws Exception {
-        //String serverList = "11.239.112.161:8848,11.239.113.204:8848,11.239.114.187:8848";
         naming = NamingFactory.createNamingService("127.0.0.1" + ":" + port);
         //naming = NamingFactory.createNamingService(serverList);
 
@@ -279,7 +278,7 @@ public void multipleTenant_deregisterInstance() throws Exception {
     }
 
     /**
-     * @TCDescription : 多租户删除实例
+     * @TCDescription : 多租户下，选择一个健康的实例
      * @TestStep :
      * @ExpectResult :
      */
@@ -296,11 +295,16 @@ public void multipleTenant_selectOneHealthyInstance() throws Exception {
         verifyInstanceListForNaming(naming1, 2, serviceName);
 
         Assert.assertEquals(2, naming1.getAllInstances(serviceName).size());
-        
+
         Instance instance = naming1.selectOneHealthyInstance(serviceName, Arrays.asList("c1"));
         Assert.assertEquals("11.11.11.11", instances.get(0).getIp());
         instance = naming2.selectOneHealthyInstance(serviceName, Arrays.asList("c1"));
         Assert.assertNull(instance);
+
+        naming1.deregisterInstance(serviceName, "11.11.11.11", TEST_PORT);
+        TimeUnit.SECONDS.sleep(2);
+        instance = naming1.selectOneHealthyInstance(serviceName);
+        Assert.assertEquals("22.22.22.22", instances.get(0).getIp());
     }
 
     private void verifyInstanceListForNaming(NamingService naming, int size, String serviceName) throws Exception {