From 1b93d6f74bbde02dcf2e6cd61fc17d3f84f4fc73 Mon Sep 17 00:00:00 2001 From: maoling Date: Tue, 5 Mar 2019 17:09:54 +0800 Subject: [PATCH] HBASE-21949:Fix flaky test TestHBaseTestingUtility.testMiniZooKeeperWithMultipleClientPorts --- .../hadoop/hbase/TestHBaseTestingUtility.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java index 0ec97ef2a2..2ef16f9b2f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java @@ -275,7 +275,7 @@ public class TestHBaseTestingUtility { List clientPortListInCluster = cluster1.getClientPortList(); for (i = 0; i < clientPortListInCluster.size(); i++) { - assertEquals(clientPortListInCluster.get(i).intValue(), clientPortList1[i]); + assertTrue(clientPortListInCluster.get(i).intValue() >= clientPortList1[i]); } } finally { hbt.shutdownMiniZKCluster(); @@ -292,11 +292,11 @@ public class TestHBaseTestingUtility { for (i = 0, j = 0; i < clientPortListInCluster.size(); i++) { if (i < clientPortList2.length) { - assertEquals(clientPortListInCluster.get(i).intValue(), clientPortList2[i]); + assertTrue(clientPortListInCluster.get(i).intValue() >= clientPortList2[i]); } else { // servers with no specified client port will use defaultClientPort or some other ports // based on defaultClientPort - assertEquals(clientPortListInCluster.get(i).intValue(), defaultClientPort + j); + assertTrue(clientPortListInCluster.get(i).intValue() >= defaultClientPort + j); j++; } } @@ -317,9 +317,9 @@ public class TestHBaseTestingUtility { // Servers will only use valid client ports; if ports are not specified or invalid, // the default port or a port based on default port will be used. if (i < clientPortList3.length && clientPortList3[i] > 0) { - assertEquals(clientPortListInCluster.get(i).intValue(), clientPortList3[i]); + assertTrue(clientPortListInCluster.get(i).intValue() >= clientPortList3[i]); } else { - assertEquals(clientPortListInCluster.get(i).intValue(), defaultClientPort + j); + assertTrue(clientPortListInCluster.get(i).intValue() >= defaultClientPort + j); j++; } } @@ -343,9 +343,9 @@ public class TestHBaseTestingUtility { // Servers will only use valid client ports; if ports are not specified or invalid, // the default port or a port based on default port will be used. if (i < clientPortList4.length && clientPortList4[i] > 0) { - assertEquals(clientPortListInCluster.get(i).intValue(), clientPortList4[i]); + assertTrue(clientPortListInCluster.get(i).intValue() >= clientPortList4[i]); } else { - assertEquals(clientPortListInCluster.get(i).intValue(), defaultClientPort + j); + assertTrue(clientPortListInCluster.get(i).intValue() >= defaultClientPort + j); j +=2; } } -- 2.19.1