Skip to content

Commit fd92057

Browse files
YiweiLi4Apache9
authored andcommitted
HBASE-27479 fix flaky test testClone in TestTaskMonitor (#4876)
Signed-off-by: Duo Zhang <[email protected]> (cherry picked from commit a2075f5)
1 parent d1ac1d5 commit fd92057

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

hbase-server/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,11 @@
325325
<artifactId>reload4j</artifactId>
326326
<scope>test</scope>
327327
</dependency>
328+
<dependency>
329+
<groupId>org.skyscreamer</groupId>
330+
<artifactId>jsonassert</artifactId>
331+
<scope>test</scope>
332+
</dependency>
328333
</dependencies>
329334
<build>
330335
<!-- Make sure resources get added before they are processed by placing this first

hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.junit.ClassRule;
3939
import org.junit.Test;
4040
import org.junit.experimental.categories.Category;
41+
import org.skyscreamer.jsonassert.JSONAssert;
4142
import org.slf4j.Logger;
4243
import org.slf4j.LoggerFactory;
4344

@@ -238,7 +239,7 @@ public void testClone() throws Exception {
238239
assertEquals(clone.getStatus(), monitor.getStatus());
239240
assertEquals(clone.toString(), monitor.toString());
240241
assertEquals(clone.toMap(), monitor.toMap());
241-
assertEquals(clone.toJSON(), monitor.toJSON());
242+
JSONAssert.assertEquals(clone.toJSON(), monitor.toJSON(), true);
242243

243244
// mark complete and make param dirty
244245
monitor.markComplete("complete RPC");

pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@
600600
<jcodings.version>1.0.55</jcodings.version>
601601
<spy.version>2.12.2</spy.version>
602602
<bouncycastle.version>1.70</bouncycastle.version>
603+
<skyscreamer.version>1.5.1</skyscreamer.version>
603604
<kerby.version>1.0.1</kerby.version>
604605
<commons-crypto.version>1.0.0</commons-crypto.version>
605606
<curator.version>4.2.0</curator.version>
@@ -1288,6 +1289,12 @@
12881289
<version>${bouncycastle.version}</version>
12891290
<scope>test</scope>
12901291
</dependency>
1292+
<dependency>
1293+
<groupId>org.skyscreamer</groupId>
1294+
<artifactId>jsonassert</artifactId>
1295+
<version>${skyscreamer.version}</version>
1296+
<scope>test</scope>
1297+
</dependency>
12911298
<dependency>
12921299
<groupId>org.apache.kerby</groupId>
12931300
<artifactId>kerb-core</artifactId>

0 commit comments

Comments
 (0)