This is an automated email from the ASF dual-hosted git repository.

symat pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git

commit 93b1455ee34fe85b1a059191d18e4b675d7b8696
Author: Mohammad Arshad <[email protected]>
AuthorDate: Thu Mar 25 10:19:36 2021 +0000

    ZOOKEEPER-4251: Flaky test: org.apache.zookeeper.test.WatcherTest
    
    Moved ReconfigTest in test suites in the last to avoid the ReconfigTest 
test impacts on other test classes
    
    Author: Mohammad Arshad <[email protected]>
    
    Reviewers: Enrico Olivelli <[email protected]>
    
    Closes #1647 from arshadmohammad/ZOOKEEPER-4251-branch-3.6
    
    (cherry picked from commit 8625c363aa23ac0c14447ce6291bea17bda3293f)
---
 .../src/test/java/org/apache/zookeeper/test/NettyNettySuiteTest.java  | 4 ++--
 .../src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/NettyNettySuiteTest.java
 
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NettyNettySuiteTest.java
index 35710ba3b..34adab14a 100644
--- 
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/NettyNettySuiteTest.java
+++ 
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NettyNettySuiteTest.java
@@ -30,9 +30,9 @@ import org.junit.runners.Suite;
         ClientTest.class,
         FourLetterWordsTest.class,
         NullDataTest.class,
-        ReconfigTest.class,
         SessionTest.class,
-        WatcherTest.class
+        WatcherTest.class,
+        ReconfigTest.class
 })
 public class NettyNettySuiteTest extends NettyNettySuiteBase {
 }
diff --git 
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java
 
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java
index a1ef33db5..57ccb7d51 100644
--- 
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java
+++ 
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java
@@ -30,9 +30,9 @@ import org.junit.runners.Suite;
         ClientTest.class,
         FourLetterWordsTest.class,
         NullDataTest.class,
-        ReconfigTest.class,
         SessionTest.class,
-        WatcherTest.class
+        WatcherTest.class,
+        ReconfigTest.class
         })
 public class NioNettySuiteTest extends NioNettySuiteBase {
 }

Reply via email to