This is an automated email from the ASF dual-hosted git repository.
ddiederen pushed a commit to branch branch-3.7
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.7 by this push:
new 3d7f374 ZOOKEEPER-4251: Flaky test:
org.apache.zookeeper.test.WatcherTest
3d7f374 is described below
commit 3d7f374c89f1bb0959e3a3b2f2b66818aa704d32
Author: Mohammad Arshad <[email protected]>
AuthorDate: Thu Mar 25 10:21:31 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 #1649 from arshadmohammad/ZOOKEEPER-4251-master
(cherry picked from commit 461aada6b015078b9a14f787dd1f526488490df9)
Signed-off-by: Damien Diederen <[email protected]>
---
.../src/test/java/org/apache/zookeeper/test/NettyNettySuiteTest.java | 2 +-
.../src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java | 2 +-
2 files changed, 2 insertions(+), 2 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 375fafe..411aae2 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
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
* Run tests with: Netty Client against Netty server
*/
@RunWith(JUnitPlatform.class)
-@SelectClasses({ACLTest.class, AsyncOpsTest.class, ChrootClientTest.class,
ClientTest.class, FourLetterWordsTest.class, NullDataTest.class,
ReconfigTest.class, SessionTest.class, WatcherTest.class})
+@SelectClasses({ACLTest.class, AsyncOpsTest.class, ChrootClientTest.class,
ClientTest.class, FourLetterWordsTest.class, NullDataTest.class,
SessionTest.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 397eb48..24fc60a 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
@@ -23,7 +23,7 @@ import org.junit.runners.Suite;
/**
* Run tests with: Nio Client against Netty server
*/
[email protected]({ACLTest.class, AsyncOpsTest.class,
ChrootClientTest.class, ClientTest.class, FourLetterWordsTest.class,
NullDataTest.class, ReconfigTest.class, SessionTest.class, WatcherTest.class})
[email protected]({ACLTest.class, AsyncOpsTest.class,
ChrootClientTest.class, ClientTest.class, FourLetterWordsTest.class,
NullDataTest.class, SessionTest.class, WatcherTest.class, ReconfigTest.class})
public class NioNettySuiteTest extends NioNettySuiteBase {
}
