You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2022/11/17 14:30:12 UTC
[hbase] 02/02: HBASE-27479 fix flaky test testClone in TestTaskMonitor (#4876)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit fd92057f22282cea0b4dd40e8a695e81f91e20b4
Author: YiweiLi4 <70...@users.noreply.github.com>
AuthorDate: Thu Nov 17 07:10:53 2022 -0600
HBASE-27479 fix flaky test testClone in TestTaskMonitor (#4876)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit a2075f51a84676c4fac7eb697a21255abddf143a)
---
hbase-server/pom.xml | 5 +++++
.../java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java | 3 ++-
pom.xml | 7 +++++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 0d0bc1c39ca..72cff29cf7e 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -325,6 +325,11 @@
<artifactId>reload4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.skyscreamer</groupId>
+ <artifactId>jsonassert</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<!-- Make sure resources get added before they are processed by placing this first
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
index f7623c4d803..70c601c71a9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
@@ -38,6 +38,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.skyscreamer.jsonassert.JSONAssert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -238,7 +239,7 @@ public class TestTaskMonitor {
assertEquals(clone.getStatus(), monitor.getStatus());
assertEquals(clone.toString(), monitor.toString());
assertEquals(clone.toMap(), monitor.toMap());
- assertEquals(clone.toJSON(), monitor.toJSON());
+ JSONAssert.assertEquals(clone.toJSON(), monitor.toJSON(), true);
// mark complete and make param dirty
monitor.markComplete("complete RPC");
diff --git a/pom.xml b/pom.xml
index 16b6328f787..77120f5cd0d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -600,6 +600,7 @@
<jcodings.version>1.0.55</jcodings.version>
<spy.version>2.12.2</spy.version>
<bouncycastle.version>1.70</bouncycastle.version>
+ <skyscreamer.version>1.5.1</skyscreamer.version>
<kerby.version>1.0.1</kerby.version>
<commons-crypto.version>1.0.0</commons-crypto.version>
<curator.version>4.2.0</curator.version>
@@ -1288,6 +1289,12 @@
<version>${bouncycastle.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.skyscreamer</groupId>
+ <artifactId>jsonassert</artifactId>
+ <version>${skyscreamer.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-core</artifactId>