From a9d3ac23d84dcd728ee08f4262e3d9b31df26b7e Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Fri, 12 Oct 2018 12:39:18 -0700 Subject: [PATCH] HBASE-21242 [amv2] Miscellaneous minor log and assign procedure create improvements; ADDENDUM Fix TestHRegionInfo --- .../java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java index 50b675dfb0..48b0ff3560 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java @@ -339,7 +339,12 @@ public class TestHRegionInfo { origDesc.indexOf(Bytes.toStringBinary(startKey)) + Bytes.toStringBinary(startKey).length()); assert(firstPart.equals(firstPartOrig)); - assert(secondPart.equals(secondPartOrig)); + // The elapsed time may be different in the two Strings since they were calculated at different + // times... so, don't include that portion when we compare. It starts with a '('. + int indexOfElapsedTime = secondPart.indexOf("("); + assertTrue(indexOfElapsedTime > 0); + assert(secondPart.substring(0, indexOfElapsedTime). + equals(secondPartOrig.substring(0, indexOfElapsedTime))); } private void checkEquality(HRegionInfo h, Configuration conf) throws IOException { -- 2.16.3