Skip to content

Commit 309ed58

Browse files
YiweiLi4Apache9
authored andcommitted
HBASE-27479 fix flaky test testClone in TestTaskMonitor (#4876)
Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit a2075f5)
1 parent 8b2c7b1 commit 309ed58

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
@@ -351,6 +351,11 @@
351351
<artifactId>bcpkix-jdk15on</artifactId>
352352
<scope>test</scope>
353353
</dependency>
354+
<dependency>
355+
<groupId>org.skyscreamer</groupId>
356+
<artifactId>jsonassert</artifactId>
357+
<scope>test</scope>
358+
</dependency>
354359
</dependencies>
355360
<build>
356361
<!-- 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
@@ -606,6 +606,7 @@
606606
<jcodings.version>1.0.56</jcodings.version>
607607
<spy.version>2.12.2</spy.version>
608608
<bouncycastle.version>1.70</bouncycastle.version>
609+
<skyscreamer.version>1.5.1</skyscreamer.version>
609610
<kerby.version>1.0.1</kerby.version>
610611
<commons-crypto.version>1.1.0</commons-crypto.version>
611612
<curator.version>4.2.0</curator.version>
@@ -1361,6 +1362,12 @@
13611362
<version>${bouncycastle.version}</version>
13621363
<scope>test</scope>
13631364
</dependency>
1365+
<dependency>
1366+
<groupId>org.skyscreamer</groupId>
1367+
<artifactId>jsonassert</artifactId>
1368+
<version>${skyscreamer.version}</version>
1369+
<scope>test</scope>
1370+
</dependency>
13641371
<dependency>
13651372
<groupId>org.bouncycastle</groupId>
13661373
<artifactId>bcpkix-jdk15on</artifactId>

0 commit comments

Comments
 (0)