Skip to content

HBASE-27479 fix flaky test testClone in TestTaskMonitor #4876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 17, 2022
Merged

HBASE-27479 fix flaky test testClone in TestTaskMonitor #4876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f1ccb3
HBASE-27479 fix flaky test testClone in TestTaskMonitor
YiweiLi4 Nov 11, 2022
55b3225
HBASE-27479 add dependency to parent pom and fix style issue
YiweiLi4 Nov 16, 2022
91cfd47
HBASE-27479 fix issue
YiweiLi4 Nov 16, 2022
d355e4c
HBASE-27479 fix issue
YiweiLi4 Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions hbase-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,11 @@
<artifactId>bcpkix-jdk15on</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
Expand Down
3 changes: 2 additions & 1 deletion hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
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;

Expand Down Expand Up @@ -238,7 +239,7 @@ public void testClone() throws Exception {
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");
Expand Down
7 changes: 7 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,7 @@
<jcodings.version>1.0.56</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.1.0</commons-crypto.version>
<curator.version>4.2.0</curator.version>
Expand Down Expand Up @@ -1570,6 +1571,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.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
Expand Down