From 8625c363aa23ac0c14447ce6291bea17bda3293f Mon Sep 17 00:00:00 2001 From: Mohammad Arshad Date: Thu, 25 Mar 2021 10:19:36 +0000 Subject: [PATCH] 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 Reviewers: Enrico Olivelli Closes #1647 from arshadmohammad/ZOOKEEPER-4251-branch-3.6 --- .../java/org/apache/zookeeper/test/NettyNettySuiteTest.java | 2 +- .../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 074d5868b5a..5fde74494ce 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 @@ -23,7 +23,7 @@ /** * Run tests with: Netty Client against Netty server */ -@Suite.SuiteClasses({ACLTest.class, AsyncOpsTest.class, ChrootClientTest.class, ClientTest.class, FourLetterWordsTest.class, NullDataTest.class, ReconfigTest.class, SessionTest.class, WatcherTest.class}) +@Suite.SuiteClasses({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 397eb487066..24fc60a2d36 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 @@ /** * Run tests with: Nio Client against Netty server */ -@Suite.SuiteClasses({ACLTest.class, AsyncOpsTest.class, ChrootClientTest.class, ClientTest.class, FourLetterWordsTest.class, NullDataTest.class, ReconfigTest.class, SessionTest.class, WatcherTest.class}) +@Suite.SuiteClasses({ACLTest.class, AsyncOpsTest.class, ChrootClientTest.class, ClientTest.class, FourLetterWordsTest.class, NullDataTest.class, SessionTest.class, WatcherTest.class, ReconfigTest.class}) public class NioNettySuiteTest extends NioNettySuiteBase { }