[Git][java-team/zookeeper][master] Refresh patches
Bastien Roucariès (@rouca)
gitlab at salsa.debian.org
Mon Mar 25 07:50:59 GMT 2024
Bastien Roucariès pushed to branch master at Debian Java Maintainers / zookeeper
Commits:
bd70fa9e by Bastien Roucariès at 2024-03-24T21:27:52+00:00
Refresh patches
- - - - -
2 changed files:
- debian/changelog
- debian/patches/20-no-Timeout-in-tests.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -16,6 +16,7 @@ zookeeper (3.9.2-1) unstable; urgency=medium
potentially critical.
* Let sysvinit init script depend on networking (Closes: #1025042)
* Add salsa CI
+ * Refresh patches
-- Bastien Roucariès <rouca at debian.org> Sun, 24 Mar 2024 21:19:51 +0000
=====================================
debian/patches/20-no-Timeout-in-tests.patch
=====================================
@@ -4,9 +4,11 @@ Author: Pierre Gruet <pgt at debian.org>
Forwarded: not-needed
Last-Update: 2022-06-18
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/ClientRequestTimeoutTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/ClientRequestTimeoutTest.java
-@@ -30,7 +30,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/ClientRequestTimeoutTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/ClientRequestTimeoutTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/ClientRequestTimeoutTest.java
+@@ -30,7 +30,6 @@ import org.apache.zookeeper.server.quoru
import org.apache.zookeeper.test.ClientBase;
import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
import org.junit.jupiter.api.Test;
@@ -14,7 +16,7 @@ Last-Update: 2022-06-18
public class ClientRequestTimeoutTest extends QuorumPeerTestBase {
-@@ -39,7 +38,6 @@
+@@ -39,7 +38,6 @@ public class ClientRequestTimeoutTest ex
private int dropPacketType = ZooDefs.OpCode.create;
@Test
@@ -22,9 +24,11 @@ Last-Update: 2022-06-18
public void testClientRequestTimeout() throws Exception {
int requestTimeOut = 15000;
System.setProperty("zookeeper.request.timeout", Integer.toString(requestTimeOut));
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesCmdTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesCmdTest.java
-@@ -32,7 +32,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesCmdTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesCmdTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesCmdTest.java
+@@ -32,7 +32,6 @@ import org.apache.zookeeper.test.ClientB
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -32,7 +36,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -68,7 +67,6 @@
+@@ -68,7 +67,6 @@ public class RemoveWatchesCmdTest extend
* local=false
*/
@Test
@@ -40,7 +44,7 @@ Last-Update: 2022-06-18
public void testRemoveWatchesWithNoPassedOptions() throws Exception {
List<EventType> expectedEvents = new ArrayList<>();
expectedEvents.add(EventType.ChildWatchRemoved);
-@@ -102,7 +100,6 @@
+@@ -102,7 +100,6 @@ public class RemoveWatchesCmdTest extend
* Test verifies deletion of NodeDataChanged watches
*/
@Test
@@ -48,7 +52,7 @@ Last-Update: 2022-06-18
public void testRemoveNodeDataChangedWatches() throws Exception {
LOG.info("Adding data watcher using getData()");
List<EventType> expectedEvents = new ArrayList<>();
-@@ -128,7 +125,6 @@
+@@ -128,7 +125,6 @@ public class RemoveWatchesCmdTest extend
* Test verifies deletion of NodeCreated data watches
*/
@Test
@@ -56,7 +60,7 @@ Last-Update: 2022-06-18
public void testRemoveNodeCreatedWatches() throws Exception {
List<EventType> expectedEvents = new ArrayList<>();
expectedEvents.add(EventType.DataWatchRemoved);
-@@ -160,7 +156,6 @@
+@@ -160,7 +156,6 @@ public class RemoveWatchesCmdTest extend
* Test verifies deletion of NodeChildrenChanged watches
*/
@Test
@@ -64,7 +68,7 @@ Last-Update: 2022-06-18
public void testRemoveNodeChildrenChangedWatches() throws Exception {
List<EventType> expectedEvents = new ArrayList<>();
expectedEvents.add(EventType.ChildWatchRemoved);
-@@ -182,7 +177,6 @@
+@@ -182,7 +177,6 @@ public class RemoveWatchesCmdTest extend
* Test verifies deletion of NodeDeleted watches
*/
@Test
@@ -72,7 +76,7 @@ Last-Update: 2022-06-18
public void testRemoveNodeDeletedWatches() throws Exception {
LOG.info("Adding NodeDeleted watcher");
List<EventType> expectedEvents = new ArrayList<>();
-@@ -214,7 +208,6 @@
+@@ -214,7 +208,6 @@ public class RemoveWatchesCmdTest extend
* Test verifies deletion of any watches
*/
@Test
@@ -80,7 +84,7 @@ Last-Update: 2022-06-18
public void testRemoveAnyWatches() throws Exception {
verifyRemoveAnyWatches(false);
}
-@@ -224,7 +217,6 @@
+@@ -224,7 +217,6 @@ public class RemoveWatchesCmdTest extend
* connection
*/
@Test
@@ -88,9 +92,11 @@ Last-Update: 2022-06-18
public void testRemoveWatchesLocallyWhenNoServerConnection() throws Exception {
verifyRemoveAnyWatches(true);
}
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesTest.java
-@@ -51,7 +51,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesTest.java
+@@ -51,7 +51,6 @@ import org.apache.zookeeper.server.Serve
import org.apache.zookeeper.test.ClientBase;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -98,7 +104,7 @@ Last-Update: 2022-06-18
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.slf4j.Logger;
-@@ -176,7 +175,6 @@
+@@ -176,7 +175,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -106,7 +112,7 @@ Last-Update: 2022-06-18
public void testRemoveSingleWatcher(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
zk1.create("/node2", null, Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
-@@ -209,7 +207,6 @@
+@@ -209,7 +207,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -114,7 +120,7 @@ Last-Update: 2022-06-18
public void testMultipleDataWatchers(boolean useAsync) throws IOException, InterruptedException, KeeperException {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
MyWatcher w1 = new MyWatcher("/node1", 1);
-@@ -240,7 +237,6 @@
+@@ -240,7 +237,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -122,7 +128,7 @@ Last-Update: 2022-06-18
public void testMultipleChildWatchers(boolean useAsync) throws IOException, InterruptedException, KeeperException {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
MyWatcher w1 = new MyWatcher("/node1", 1);
-@@ -276,7 +272,6 @@
+@@ -276,7 +272,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -130,7 +136,7 @@ Last-Update: 2022-06-18
public void testRemoveAllWatchers(boolean useAsync) throws IOException, InterruptedException, KeeperException {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
MyWatcher w1 = new MyWatcher("/node1", 2);
-@@ -302,7 +297,6 @@
+@@ -302,7 +297,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -138,7 +144,7 @@ Last-Update: 2022-06-18
public void testRemoveAllDataWatchers(boolean useAsync) throws IOException, InterruptedException, KeeperException {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
MyWatcher w1 = new MyWatcher("/node1", 1);
-@@ -345,7 +339,6 @@
+@@ -345,7 +339,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -146,7 +152,7 @@ Last-Update: 2022-06-18
public void testRemoveAllChildWatchers(boolean useAsync) throws IOException, InterruptedException, KeeperException {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
MyWatcher w1 = new MyWatcher("/node1", 1);
-@@ -389,7 +382,6 @@
+@@ -389,7 +382,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -154,7 +160,7 @@ Last-Update: 2022-06-18
public void testRemoveAllPersistentWatchers(boolean useAsync) throws InterruptedException, KeeperException {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
BlockingDeque<WatchedEvent> persistentEvents1 = new LinkedBlockingDeque<>();
-@@ -434,7 +426,6 @@
+@@ -434,7 +426,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -162,7 +168,7 @@ Last-Update: 2022-06-18
public void testRemoveAllPersistentRecursiveWatchers(boolean useAsync) throws InterruptedException, KeeperException {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
BlockingDeque<WatchedEvent> recursiveEvents1 = new LinkedBlockingDeque<>();
-@@ -477,7 +468,6 @@
+@@ -477,7 +468,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -170,7 +176,7 @@ Last-Update: 2022-06-18
public void testNoWatcherException(boolean useAsync) throws IOException, InterruptedException, KeeperException {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
MyWatcher w1 = new MyWatcher("/node1", 2);
-@@ -506,7 +496,6 @@
+@@ -506,7 +496,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -178,7 +184,7 @@ Last-Update: 2022-06-18
public void testRemoveAnyDataWatcher(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
MyWatcher w1 = new MyWatcher("/node1", 1);
-@@ -533,7 +522,6 @@
+@@ -533,7 +522,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -186,7 +192,7 @@ Last-Update: 2022-06-18
public void testRemoveAnyChildWatcher(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
MyWatcher w1 = new MyWatcher("/node1", 2);
-@@ -559,7 +547,6 @@
+@@ -559,7 +547,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -194,7 +200,7 @@ Last-Update: 2022-06-18
public void testRemoveWatcherWhenNoConnection(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
MyWatcher w1 = new MyWatcher("/node1", 2);
-@@ -590,7 +577,6 @@
+@@ -590,7 +577,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -202,7 +208,7 @@ Last-Update: 2022-06-18
public void testManyPreNodeWatchers(boolean useAsync) throws Exception {
int count = 50;
List<MyWatcher> wList = new ArrayList<>(count);
-@@ -619,7 +605,6 @@
+@@ -619,7 +605,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -210,7 +216,7 @@ Last-Update: 2022-06-18
public void testManyChildWatchers(boolean useAsync) throws Exception {
int count = 50;
List<MyWatcher> wList = new ArrayList<>(count);
-@@ -655,7 +640,6 @@
+@@ -655,7 +640,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -218,7 +224,7 @@ Last-Update: 2022-06-18
public void testManyDataWatchers(boolean useAsync) throws Exception {
int count = 50;
List<MyWatcher> wList = new ArrayList<>(count);
-@@ -687,7 +671,6 @@
+@@ -687,7 +671,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -226,7 +232,7 @@ Last-Update: 2022-06-18
public void testManyWatchersWhenNoConnection(boolean useAsync) throws Exception {
int count = 3;
List<MyWatcher> wList = new ArrayList<>(count);
-@@ -734,7 +717,6 @@
+@@ -734,7 +717,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -234,7 +240,7 @@ Last-Update: 2022-06-18
public void testChRootRemoveWatcher(boolean useAsync) throws Exception {
// creating the subtree for chRoot clients.
String chRoot = "/appsX";
-@@ -790,7 +772,6 @@
+@@ -790,7 +772,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -242,7 +248,7 @@ Last-Update: 2022-06-18
public void testNoWatcherServerException(boolean useAsync) throws KeeperException, InterruptedException, IOException, TimeoutException {
CountdownWatcher watcher = new CountdownWatcher();
ZooKeeper zk = spy(new ZooKeeper(hostPort, CONNECTION_TIMEOUT, watcher));
-@@ -809,7 +790,6 @@
+@@ -809,7 +790,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -250,7 +256,7 @@ Last-Update: 2022-06-18
public void testRemoveAllNoWatcherException(boolean useAsync) throws IOException, InterruptedException, KeeperException {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
removeAllWatches(zk2, "/node1", WatcherType.Any, false, Code.NOWATCHER, useAsync);
-@@ -820,7 +800,6 @@
+@@ -820,7 +800,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -258,7 +264,7 @@ Last-Update: 2022-06-18
public void testNullWatcherReference(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
try {
-@@ -841,7 +820,6 @@
+@@ -841,7 +820,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -266,7 +272,7 @@ Last-Update: 2022-06-18
public void testRemoveWhenMultipleDataWatchesOnAPath(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
final CountDownLatch dataWatchCount = new CountDownLatch(1);
-@@ -876,7 +854,6 @@
+@@ -876,7 +854,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -274,7 +280,7 @@ Last-Update: 2022-06-18
public void testRemoveWhenMultipleChildWatchesOnAPath(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
final CountDownLatch childWatchCount = new CountDownLatch(1);
-@@ -910,7 +887,6 @@
+@@ -910,7 +887,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -282,7 +288,7 @@ Last-Update: 2022-06-18
public void testRemoveWhenMultiplePersistentWatchesOnAPath(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-@@ -934,7 +910,6 @@
+@@ -934,7 +910,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -290,7 +296,7 @@ Last-Update: 2022-06-18
public void testRemoveWhenMultiplePersistentRecursiveWatchesOnAPath(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-@@ -958,7 +933,6 @@
+@@ -958,7 +933,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -298,7 +304,7 @@ Last-Update: 2022-06-18
public void testRemovePersistentWatchesOnAPathPartially(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-@@ -988,7 +962,6 @@
+@@ -988,7 +962,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -306,7 +312,7 @@ Last-Update: 2022-06-18
public void testRemoveAllDataWatchesOnAPath(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-@@ -1033,7 +1006,6 @@
+@@ -1033,7 +1006,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -314,7 +320,7 @@ Last-Update: 2022-06-18
public void testRemoveAllChildWatchesOnAPath(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-@@ -1076,7 +1048,6 @@
+@@ -1076,7 +1048,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -322,7 +328,7 @@ Last-Update: 2022-06-18
public void testRemoveAllPersistentWatchesOnAPath(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-@@ -1116,7 +1087,6 @@
+@@ -1116,7 +1087,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -330,7 +336,7 @@ Last-Update: 2022-06-18
public void testRemoveAllPersistentWatchesOnAPathPartially(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-@@ -1145,7 +1115,6 @@
+@@ -1145,7 +1115,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -338,7 +344,7 @@ Last-Update: 2022-06-18
public void testRemoveAllPersistentRecursiveWatchesOnAPath(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-@@ -1187,7 +1156,6 @@
+@@ -1187,7 +1156,6 @@ public class RemoveWatchesTest extends C
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -346,9 +352,11 @@ Last-Update: 2022-06-18
public void testRemoveAllWatchesOnAPath(boolean useAsync) throws Exception {
zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/client/ZKClientConfigTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/client/ZKClientConfigTest.java
-@@ -40,7 +40,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/client/ZKClientConfigTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/client/ZKClientConfigTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/client/ZKClientConfigTest.java
+@@ -40,7 +40,6 @@ import org.apache.zookeeper.common.ZKCon
import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -356,7 +364,7 @@ Last-Update: 2022-06-18
public class ZKClientConfigTest {
-@@ -54,7 +53,6 @@
+@@ -54,7 +53,6 @@ public class ZKClientConfigTest {
}
@Test
@@ -364,7 +372,7 @@ Last-Update: 2022-06-18
public void testDefaultConfiguration() {
Map<String, String> properties = new HashMap<>();
properties.put(ZK_SASL_CLIENT_USERNAME, "zookeeper1");
-@@ -93,7 +91,6 @@
+@@ -93,7 +91,6 @@ public class ZKClientConfigTest {
}
@Test
@@ -372,7 +380,7 @@ Last-Update: 2022-06-18
public void testSystemPropertyValue() {
String clientName = "zookeeper1";
System.setProperty(ZK_SASL_CLIENT_USERNAME, clientName);
-@@ -108,7 +105,6 @@
+@@ -108,7 +105,6 @@ public class ZKClientConfigTest {
}
@Test
@@ -380,7 +388,7 @@ Last-Update: 2022-06-18
public void testReadConfigurationFile() throws IOException, ConfigException {
File file = File.createTempFile("clientConfig", ".conf", testData);
file.deleteOnExit();
-@@ -139,7 +135,6 @@
+@@ -139,7 +135,6 @@ public class ZKClientConfigTest {
}
@Test
@@ -388,7 +396,7 @@ Last-Update: 2022-06-18
public void testSetConfiguration() {
ZKClientConfig conf = new ZKClientConfig();
String defaultValue = conf.getProperty(ZKClientConfig.ENABLE_CLIENT_SASL_KEY, ZKClientConfig.ENABLE_CLIENT_SASL_DEFAULT);
-@@ -152,7 +147,6 @@
+@@ -152,7 +147,6 @@ public class ZKClientConfigTest {
}
@Test
@@ -396,7 +404,7 @@ Last-Update: 2022-06-18
public void testIntegerRetrievalFromProperty() {
ZKClientConfig conf = new ZKClientConfig();
String prop = "UnSetProperty" + System.currentTimeMillis();
-@@ -186,7 +180,6 @@
+@@ -186,7 +180,6 @@ public class ZKClientConfigTest {
}
@Test
@@ -404,9 +412,11 @@ Last-Update: 2022-06-18
public void testIntegerRetrievalFromHexadecimalProperty() {
int hexaValue = 0x3000000;
String wrongValue = "0xwel";
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509UtilTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509UtilTest.java
-@@ -52,7 +52,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509UtilTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509UtilTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509UtilTest.java
+@@ -54,7 +54,6 @@ import org.apache.zookeeper.PortAssignme
import org.apache.zookeeper.client.ZKClientConfig;
import org.apache.zookeeper.server.ServerCnxnFactory;
import org.junit.jupiter.api.AfterEach;
@@ -414,7 +424,7 @@ Last-Update: 2022-06-18
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-@@ -95,7 +94,6 @@
+@@ -97,7 +96,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -422,7 +432,7 @@ Last-Update: 2022-06-18
public void testCreateSSLContextWithoutCustomProtocol(
X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
throws Exception {
-@@ -106,7 +104,6 @@
+@@ -122,7 +120,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -430,7 +440,7 @@ Last-Update: 2022-06-18
public void testCreateSSLContextWithCustomProtocol(
X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
throws Exception {
-@@ -119,7 +116,6 @@
+@@ -135,7 +132,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -438,7 +448,7 @@ Last-Update: 2022-06-18
public void testCreateSSLContextWithoutKeyStoreLocation(
X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
throws Exception {
-@@ -130,7 +126,6 @@
+@@ -146,7 +142,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -446,7 +456,7 @@ Last-Update: 2022-06-18
public void testCreateSSLContextWithoutKeyStorePassword(
X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
throws Exception {
-@@ -146,7 +141,6 @@
+@@ -162,7 +157,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -454,7 +464,7 @@ Last-Update: 2022-06-18
public void testCreateSSLContext_withKeyStorePasswordFromFile(final X509KeyType caKeyType,
final X509KeyType certKeyType,
final String keyPassword,
-@@ -161,7 +155,6 @@
+@@ -177,7 +171,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -462,7 +472,7 @@ Last-Update: 2022-06-18
public void testCreateSSLContext_withTrustStorePasswordFromFile(final X509KeyType caKeyType,
final X509KeyType certKeyType,
final String keyPassword,
-@@ -175,7 +168,6 @@
+@@ -191,7 +184,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -470,7 +480,7 @@ Last-Update: 2022-06-18
public void testCreateSSLContext_withWrongKeyStorePasswordFromFile(final X509KeyType caKeyType,
final X509KeyType certKeyType,
final String keyPassword,
-@@ -186,7 +178,6 @@
+@@ -202,7 +194,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -478,7 +488,7 @@ Last-Update: 2022-06-18
public void testCreateSSLContext_withWrongTrustStorePasswordFromFile(final X509KeyType caKeyType,
final X509KeyType certKeyType,
final String keyPassword,
-@@ -197,7 +188,6 @@
+@@ -213,7 +204,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -486,7 +496,7 @@ Last-Update: 2022-06-18
public void testCreateSSLContextWithCustomCipherSuites(
X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
throws Exception {
-@@ -211,7 +201,6 @@
+@@ -227,7 +217,6 @@ public class X509UtilTest extends BaseX5
// possible
@ParameterizedTest
@MethodSource("data")
@@ -494,7 +504,7 @@ Last-Update: 2022-06-18
public void testCRLEnabled(
X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
throws Exception {
-@@ -225,7 +214,6 @@
+@@ -241,7 +230,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -502,7 +512,7 @@ Last-Update: 2022-06-18
public void testCRLDisabled(
X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
throws Exception {
-@@ -238,7 +226,6 @@
+@@ -254,7 +242,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -510,7 +520,7 @@ Last-Update: 2022-06-18
public void testOCSPEnabled(
X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
throws Exception {
-@@ -252,7 +239,6 @@
+@@ -268,7 +255,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -518,7 +528,7 @@ Last-Update: 2022-06-18
public void testCreateSSLSocket(
X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
throws Exception {
-@@ -264,7 +250,6 @@
+@@ -280,7 +266,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -526,7 +536,7 @@ Last-Update: 2022-06-18
public void testCreateSSLServerSocketWithoutPort(
X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
throws Exception {
-@@ -277,7 +262,6 @@
+@@ -293,7 +278,6 @@ public class X509UtilTest extends BaseX5
@ParameterizedTest
@MethodSource("data")
@@ -534,9 +544,11 @@ Last-Update: 2022-06-18
public void testCreateSSLServerSocketWithPort(
X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
throws Exception {
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
-@@ -21,7 +21,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
+@@ -21,7 +21,6 @@ package org.apache.zookeeper.common;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -544,7 +556,7 @@ Last-Update: 2022-06-18
public class ZKConfigTest {
-@@ -34,7 +33,6 @@
+@@ -34,7 +33,6 @@ public class ZKConfigTest {
// property is not set we should get the default value
@Test
@@ -552,7 +564,7 @@ Last-Update: 2022-06-18
public void testBooleanRetrievalFromPropertyDefault() {
ZKConfig conf = new ZKConfig();
String prop = "UnSetProperty" + System.currentTimeMillis();
-@@ -45,7 +43,6 @@
+@@ -45,7 +43,6 @@ public class ZKConfigTest {
// property is set to an valid boolean, we should get the set value
@Test
@@ -560,7 +572,7 @@ Last-Update: 2022-06-18
public void testBooleanRetrievalFromProperty() {
boolean value = true;
boolean defaultValue = false;
-@@ -57,7 +54,6 @@
+@@ -57,7 +54,6 @@ public class ZKConfigTest {
// property is set but with white spaces in the beginning
@Test
@@ -568,7 +580,7 @@ Last-Update: 2022-06-18
public void testBooleanRetrievalFromPropertyWithWhitespacesInBeginning() {
boolean value = true;
boolean defaultValue = false;
-@@ -69,7 +65,6 @@
+@@ -69,7 +65,6 @@ public class ZKConfigTest {
// property is set but with white spaces at the end
@Test
@@ -576,7 +588,7 @@ Last-Update: 2022-06-18
public void testBooleanRetrievalFromPropertyWithWhitespacesAtEnd() {
boolean value = true;
boolean defaultValue = false;
-@@ -81,7 +76,6 @@
+@@ -81,7 +76,6 @@ public class ZKConfigTest {
// property is set but with white spaces at the beginning and the end
@Test
@@ -584,9 +596,11 @@ Last-Update: 2022-06-18
public void testBooleanRetrievalFromPropertyWithWhitespacesAtBeginningAndEnd() {
boolean value = true;
boolean defaultValue = false;
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateContainerTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateContainerTest.java
-@@ -48,7 +48,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateContainerTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateContainerTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateContainerTest.java
+@@ -48,7 +48,6 @@ import org.apache.zookeeper.test.ClientB
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -594,7 +608,7 @@ Last-Update: 2022-06-18
public class CreateContainerTest extends ClientBase {
-@@ -82,14 +81,12 @@
+@@ -82,14 +81,12 @@ public class CreateContainerTest extends
}
@Test
@@ -609,7 +623,7 @@ Last-Update: 2022-06-18
public void testCreateWithStat() throws KeeperException, InterruptedException {
Stat stat = createWithStatVerifyResult("/foo");
Stat childStat = createWithStatVerifyResult("/foo/child");
-@@ -99,7 +96,6 @@
+@@ -99,7 +96,6 @@ public class CreateContainerTest extends
@SuppressWarnings("ConstantConditions")
@Test
@@ -617,7 +631,7 @@ Last-Update: 2022-06-18
public void testCreateWithNullStat() throws KeeperException, InterruptedException {
final String name = "/foo";
assertNull(zk.exists(name, false));
-@@ -113,7 +109,6 @@
+@@ -113,7 +109,6 @@ public class CreateContainerTest extends
}
@Test
@@ -625,7 +639,7 @@ Last-Update: 2022-06-18
public void testSimpleDeletion() throws KeeperException, InterruptedException {
zk.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
zk.create("/foo/bar", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-@@ -127,7 +122,6 @@
+@@ -127,7 +122,6 @@ public class CreateContainerTest extends
}
@Test
@@ -633,7 +647,7 @@ Last-Update: 2022-06-18
public void testMultiWithContainerSimple() throws KeeperException, InterruptedException {
Op createContainer = Op.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
zk.multi(Collections.singletonList(createContainer));
-@@ -137,7 +131,6 @@
+@@ -137,7 +131,6 @@ public class CreateContainerTest extends
}
@Test
@@ -641,7 +655,7 @@ Last-Update: 2022-06-18
public void testMultiWithContainer() throws KeeperException, InterruptedException {
Op createContainer = Op.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
Op createChild = Op.create("/foo/bar", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-@@ -166,7 +159,6 @@
+@@ -166,7 +159,6 @@ public class CreateContainerTest extends
}
@Test
@@ -649,7 +663,7 @@ Last-Update: 2022-06-18
public void testSimpleDeletionAsync() throws KeeperException, InterruptedException {
final CountDownLatch latch = new CountDownLatch(1);
AsyncCallback.Create2Callback cb = (rc, path, ctx, name, stat) -> {
-@@ -186,7 +178,6 @@
+@@ -186,7 +178,6 @@ public class CreateContainerTest extends
}
@Test
@@ -657,7 +671,7 @@ Last-Update: 2022-06-18
public void testCascadingDeletion() throws KeeperException, InterruptedException {
zk.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
zk.create("/foo/bar", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
-@@ -204,7 +195,6 @@
+@@ -204,7 +195,6 @@ public class CreateContainerTest extends
}
@Test
@@ -665,7 +679,7 @@ Last-Update: 2022-06-18
public void testFalseEmpty() throws KeeperException, InterruptedException {
zk.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
zk.create("/foo/bar", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-@@ -221,7 +211,6 @@
+@@ -221,7 +211,6 @@ public class CreateContainerTest extends
}
@Test
@@ -673,7 +687,7 @@ Last-Update: 2022-06-18
public void testMaxPerMinute() throws InterruptedException {
final BlockingQueue<String> queue = new LinkedBlockingQueue<>();
RequestProcessor processor = new RequestProcessor() {
-@@ -263,7 +252,6 @@
+@@ -263,7 +252,6 @@ public class CreateContainerTest extends
}
@Test
@@ -681,7 +695,7 @@ Last-Update: 2022-06-18
public void testMaxNeverUsedInterval() throws KeeperException, InterruptedException {
zk.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
AtomicLong elapsed = new AtomicLong(0);
-@@ -291,7 +279,6 @@
+@@ -291,7 +279,6 @@ public class CreateContainerTest extends
}
@Test
@@ -689,9 +703,11 @@ Last-Update: 2022-06-18
public void testZeroMaxNeverUsedInterval() throws KeeperException, InterruptedException {
zk.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
AtomicInteger deletesQty = new AtomicInteger(0);
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/DataTreeTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/DataTreeTest.java
-@@ -52,7 +52,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/DataTreeTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/DataTreeTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/DataTreeTest.java
+@@ -52,7 +52,6 @@ import org.apache.zookeeper.metrics.Metr
import org.apache.zookeeper.txn.CreateTxn;
import org.apache.zookeeper.txn.TxnHeader;
import org.junit.jupiter.api.Test;
@@ -699,7 +715,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -65,7 +64,6 @@
+@@ -65,7 +64,6 @@ public class DataTreeTest extends ZKTest
* removing the session related ephemerals from DataTree structure
*/
@Test
@@ -707,7 +723,7 @@ Last-Update: 2022-06-18
public void testDumpEphemerals() throws Exception {
int count = 1000;
long session = 1000;
-@@ -110,7 +108,6 @@
+@@ -110,7 +108,6 @@ public class DataTreeTest extends ZKTest
}
@Test
@@ -715,7 +731,7 @@ Last-Update: 2022-06-18
public void testRootWatchTriggered() throws Exception {
DataTree dt = new DataTree();
-@@ -132,7 +129,6 @@
+@@ -132,7 +129,6 @@ public class DataTreeTest extends ZKTest
* For ZOOKEEPER-1046 test if cversion is getting incremented correctly.
*/
@Test
@@ -723,7 +739,7 @@ Last-Update: 2022-06-18
public void testIncrementCversion() throws Exception {
try {
// digestCalculator gets initialized for the new DataTree constructor based on the system property
-@@ -226,7 +222,6 @@
+@@ -226,7 +222,6 @@ public class DataTreeTest extends ZKTest
}
@Test
@@ -731,7 +747,7 @@ Last-Update: 2022-06-18
public void testPathTrieClearOnDeserialize() throws Exception {
//Create a DataTree with quota nodes so PathTrie get updated
-@@ -265,7 +260,6 @@
+@@ -265,7 +260,6 @@ public class DataTreeTest extends ZKTest
* This test verifies the fix that we should not hold ACL cache during dumping aclcache to snapshots
*/
@Test
@@ -739,7 +755,7 @@ Last-Update: 2022-06-18
public void testSerializeDoesntLockACLCacheWhileWriting() throws Exception {
DataTree tree = new DataTree();
tree.createNode("/marker", new byte[] { 42 }, null, -1, 1, 1, 1);
-@@ -310,7 +304,6 @@
+@@ -310,7 +304,6 @@ public class DataTreeTest extends ZKTest
/* ZOOKEEPER-3531 - similarly for aclCache.deserialize, we should not hold lock either
*/
@Test
@@ -747,7 +763,7 @@ Last-Update: 2022-06-18
public void testDeserializeDoesntLockACLCacheWhileReading() throws Exception {
DataTree tree = new DataTree();
tree.createNode("/marker", new byte[] { 42 }, null, -1, 1, 1, 1);
-@@ -368,7 +361,6 @@
+@@ -368,7 +361,6 @@ public class DataTreeTest extends ZKTest
* the DataNode lock while calling OutputArchive.writeRecord.
*/
@Test
@@ -755,7 +771,7 @@ Last-Update: 2022-06-18
public void testSerializeDoesntLockDataNodeWhileWriting() throws Exception {
DataTree tree = new DataTree();
tree.createNode("/marker", new byte[] { 42 }, null, -1, 1, 1, 1);
-@@ -417,7 +409,6 @@
+@@ -417,7 +409,6 @@ public class DataTreeTest extends ZKTest
}
@Test
@@ -763,9 +779,11 @@ Last-Update: 2022-06-18
public void testReconfigACLClearOnDeserialize() throws Exception {
DataTree tree = new DataTree();
// simulate the upgrading scenario, where the reconfig znode
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/NIOServerCnxnTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/NIOServerCnxnTest.java
-@@ -32,7 +32,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/NIOServerCnxnTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/NIOServerCnxnTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/NIOServerCnxnTest.java
+@@ -32,7 +32,6 @@ import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.server.quorum.BufferStats;
import org.apache.zookeeper.test.ClientBase;
import org.junit.jupiter.api.Test;
@@ -773,7 +791,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -44,7 +43,6 @@
+@@ -44,7 +43,6 @@ public class NIOServerCnxnTest extends C
* Test operations on ServerCnxn after socket closure.
*/
@Test
@@ -781,9 +799,11 @@ Last-Update: 2022-06-18
public void testOperationsAfterCnxnClose() throws IOException, InterruptedException, KeeperException {
final ZooKeeper zk = createClient();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/NettyServerCnxnTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/NettyServerCnxnTest.java
-@@ -61,7 +61,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/NettyServerCnxnTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/NettyServerCnxnTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/NettyServerCnxnTest.java
+@@ -61,7 +61,6 @@ import org.apache.zookeeper.test.TestByt
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -791,7 +811,7 @@ Last-Update: 2022-06-18
import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -101,7 +100,6 @@
+@@ -101,7 +100,6 @@ public class NettyServerCnxnTest extends
* @see <a href="https://issues.jboss.org/browse/NETTY-412">NETTY-412</a>
*/
@Test
@@ -799,7 +819,7 @@ Last-Update: 2022-06-18
public void testSendCloseSession() throws Exception {
assertTrue(serverFactory instanceof NettyServerCnxnFactory, "Didn't instantiate ServerCnxnFactory with NettyServerCnxnFactory!");
-@@ -141,7 +139,6 @@
+@@ -141,7 +139,6 @@ public class NettyServerCnxnTest extends
* connection fails.
*/
@Test
@@ -807,9 +827,11 @@ Last-Update: 2022-06-18
public void testMaxConnectionPerIpSurpased() {
assertTrue(serverFactory instanceof NettyServerCnxnFactory, "Did not instantiate ServerCnxnFactory with NettyServerCnxnFactory!");
assertThrows(ProtocolException.class, () -> {
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/SessionTrackerTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/SessionTrackerTest.java
-@@ -34,7 +34,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/SessionTrackerTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/SessionTrackerTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/SessionTrackerTest.java
+@@ -34,7 +34,6 @@ import org.apache.zookeeper.ZooDefs.OpCo
import org.apache.zookeeper.server.SessionTrackerImpl.SessionImpl;
import org.apache.zookeeper.test.ClientBase;
import org.junit.jupiter.api.Test;
@@ -817,7 +839,7 @@ Last-Update: 2022-06-18
/**
* Testing zk client session logic in sessiontracker
-@@ -51,7 +50,6 @@
+@@ -51,7 +50,6 @@ public class SessionTrackerTest extends
* the session expiration.
*/
@Test
@@ -825,7 +847,7 @@ Last-Update: 2022-06-18
public void testAddSessionAfterSessionExpiry() throws Exception {
RequestThrottler.setMaxRequests(0);
ZooKeeperServer zks = setupSessionTracker();
-@@ -89,7 +87,6 @@
+@@ -89,7 +87,6 @@ public class SessionTrackerTest extends
* after session expiration by the session tracker
*/
@Test
@@ -833,9 +855,11 @@ Last-Update: 2022-06-18
public void testCloseSessionRequestAfterSessionExpiry() throws Exception {
ZooKeeperServer zks = setupSessionTracker();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMainTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMainTest.java
-@@ -49,7 +49,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMainTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMainTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMainTest.java
+@@ -49,7 +49,6 @@ import org.apache.zookeeper.server.persi
import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
import org.apache.zookeeper.test.ClientBase;
import org.junit.jupiter.api.Test;
@@ -843,7 +867,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -178,7 +177,6 @@
+@@ -178,7 +177,6 @@ public class ZooKeeperServerMainTest ext
* writing transaction log), ZooKeeper is still available.
*/
@Test
@@ -851,7 +875,7 @@ Last-Update: 2022-06-18
public void testNonRecoverableError() throws Exception {
ClientBase.setupTestEnv();
-@@ -229,7 +227,6 @@
+@@ -229,7 +227,6 @@ public class ZooKeeperServerMainTest ext
* This test will fail if it is executed as root user.
*/
@Test
@@ -859,7 +883,7 @@ Last-Update: 2022-06-18
public void testReadOnlySnapshotDir() throws Exception {
ClientBase.setupTestEnv();
final int CLIENT_PORT = PortAssignment.unique();
-@@ -268,7 +265,6 @@
+@@ -268,7 +265,6 @@ public class ZooKeeperServerMainTest ext
* This test will fail if it is executed as root user.
*/
@Test
@@ -867,9 +891,11 @@ Last-Update: 2022-06-18
public void testReadOnlyTxnLogDir() throws Exception {
ClientBase.setupTestEnv();
final int CLIENT_PORT = PortAssignment.unique();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMaxCnxnsTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMaxCnxnsTest.java
-@@ -33,7 +33,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMaxCnxnsTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMaxCnxnsTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMaxCnxnsTest.java
+@@ -33,7 +33,6 @@ import org.apache.zookeeper.test.ClientB
import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -877,7 +903,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -52,14 +51,12 @@
+@@ -52,14 +51,12 @@ public class ZooKeeperServerMaxCnxnsTest
*/
@Test
@@ -892,16 +918,18 @@ Last-Update: 2022-06-18
public void testMaxZooKeeperClientsWithNettyServerCnxnFactory() throws Exception {
String serverCnxnFactory = "org.apache.zookeeper.server.NettyServerCnxnFactory";
testMaxZooKeeperClients(serverCnxnFactory);
-@@ -177,4 +174,4 @@
+@@ -177,4 +174,4 @@ public class ZooKeeperServerMaxCnxnsTest
}
}
}
-}
\ No newline at end of file
+}
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java
-@@ -35,7 +35,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java
+@@ -35,7 +35,6 @@ import org.apache.zookeeper.test.ClientB
import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -909,7 +937,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -77,7 +76,6 @@
+@@ -77,7 +76,6 @@ public class ZooKeeperServerStartupTest
* https://issues.apache.org/jira/browse/ZOOKEEPER-2383
*/
@Test
@@ -917,7 +945,7 @@ Last-Update: 2022-06-18
public void testClientConnectionRequestDuringStartupWithNIOServerCnxn() throws Exception {
tmpDir = ClientBase.createTmpDir();
ClientBase.setupTestEnv();
-@@ -108,7 +106,6 @@
+@@ -108,7 +106,6 @@ public class ZooKeeperServerStartupTest
* https://issues.apache.org/jira/browse/ZOOKEEPER-2383
*/
@Test
@@ -925,7 +953,7 @@ Last-Update: 2022-06-18
public void testClientConnectionRequestDuringStartupWithNettyServerCnxn() throws Exception {
tmpDir = ClientBase.createTmpDir();
ClientBase.setupTestEnv();
-@@ -148,7 +145,6 @@
+@@ -148,7 +145,6 @@ public class ZooKeeperServerStartupTest
* https://issues.apache.org/jira/browse/ZOOKEEPER-2383
*/
@Test
@@ -933,9 +961,11 @@ Last-Update: 2022-06-18
public void testFourLetterWords() throws Exception {
startSimpleZKServer(startupDelayLatch);
verify("conf", ZK_NOT_SERVING);
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperThreadTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperThreadTest.java
-@@ -23,7 +23,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperThreadTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperThreadTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperThreadTest.java
+@@ -23,7 +23,6 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.TimeUnit;
import org.apache.zookeeper.ZKTestCase;
import org.junit.jupiter.api.Test;
@@ -943,7 +973,7 @@ Last-Update: 2022-06-18
public class ZooKeeperThreadTest extends ZKTestCase {
-@@ -73,7 +72,6 @@
+@@ -73,7 +72,6 @@ public class ZooKeeperThreadTest extends
* Test verifies uncaught exception handling of ZooKeeperThread
*/
@Test
@@ -951,9 +981,11 @@ Last-Update: 2022-06-18
public void testUncaughtException() throws Exception {
MyThread t1 = new MyThread("Test-Thread");
t1.start();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorConcurrencyTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorConcurrencyTest.java
-@@ -49,7 +49,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorConcurrencyTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorConcurrencyTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorConcurrencyTest.java
+@@ -49,7 +49,6 @@ import org.apache.zookeeper.server.ZooKe
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -961,7 +993,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -419,7 +418,6 @@
+@@ -419,7 +418,6 @@ public class CommitProcessorConcurrencyT
* processed.
*/
@Test
@@ -969,7 +1001,7 @@ Last-Update: 2022-06-18
public void noStarvationOfNonLocalCommittedRequestsTest() throws Exception {
final String path = "/noStarvationOfCommittedRequests";
processor.queuedRequests = new MockRequestsQueue();
-@@ -522,7 +520,6 @@
+@@ -522,7 +520,6 @@ public class CommitProcessorConcurrencyT
* session queue but it sees a commit for a request that belongs to the previous connection.
*/
@Test
@@ -977,7 +1009,7 @@ Last-Update: 2022-06-18
public void noCrashOnCommittedRequestsOfUnseenRequestTest() throws Exception {
final String path = "/noCrash/OnCommittedRequests/OfUnseenRequestTest";
final int numberofReads = 10;
-@@ -584,7 +581,6 @@
+@@ -584,7 +581,6 @@ public class CommitProcessorConcurrencyT
* We should commit the requests according to the order we receive from the leader, i.e., wait for the relevant commit.
*/
@Test
@@ -985,9 +1017,11 @@ Last-Update: 2022-06-18
public void noCrashOnOutofOrderCommittedRequestTest() throws Exception {
final String path = "/noCrash/OnCommittedRequests/OfUnSeenRequestTest";
final int sessionid = 0x123456;
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/DIFFSyncConsistencyTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/DIFFSyncConsistencyTest.java
-@@ -41,7 +41,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/DIFFSyncConsistencyTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/DIFFSyncConsistencyTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/DIFFSyncConsistencyTest.java
+@@ -41,7 +41,6 @@ import org.apache.zookeeper.test.ClientB
import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -995,7 +1029,7 @@ Last-Update: 2022-06-18
public class DIFFSyncConsistencyTest extends QuorumPeerTestBase {
-@@ -49,7 +48,6 @@
+@@ -49,7 +48,6 @@ public class DIFFSyncConsistencyTest ext
private MainThread[] mt = new MainThread[SERVER_COUNT];
@Test
@@ -1003,9 +1037,11 @@ Last-Update: 2022-06-18
public void testInconsistentDueToUncommittedLog() throws Exception {
final int LEADER_TIMEOUT_MS = 10_000;
final int[] clientPorts = new int[SERVER_COUNT];
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java
-@@ -40,7 +40,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java
+@@ -40,7 +40,6 @@ import org.apache.zookeeper.test.ClientB
import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -1013,7 +1049,7 @@ Last-Update: 2022-06-18
public class EphemeralNodeDeletionTest extends QuorumPeerTestBase {
-@@ -54,7 +53,6 @@
+@@ -54,7 +53,6 @@ public class EphemeralNodeDeletionTest e
*/
@Test
@@ -1021,9 +1057,11 @@ Last-Update: 2022-06-18
public void testEphemeralNodeDeletion() throws Exception {
final int[] clientPorts = new int[SERVER_COUNT];
StringBuilder sb = new StringBuilder();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EpochWriteFailureTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EpochWriteFailureTest.java
-@@ -32,7 +32,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EpochWriteFailureTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EpochWriteFailureTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EpochWriteFailureTest.java
+@@ -32,7 +32,6 @@ import org.apache.zookeeper.test.ClientB
import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
@@ -1031,7 +1069,7 @@ Last-Update: 2022-06-18
public class EpochWriteFailureTest extends QuorumPeerTestBase {
private static int SERVER_COUNT = 3;
-@@ -47,7 +46,6 @@
+@@ -47,7 +46,6 @@ public class EpochWriteFailureTest exten
* run time values of acceptedEpoch,
*/
@Test
@@ -1039,9 +1077,11 @@ Last-Update: 2022-06-18
public void testAcceptedEpochWriteFailure() throws Exception {
StringBuilder sb = new StringBuilder();
sb.append("admin.enableServer=false");
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java
-@@ -118,7 +118,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java
+@@ -118,7 +118,6 @@ import org.bouncycastle.operator.jcajce.
import org.bouncycastle.util.io.pem.PemWriter;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -1049,7 +1089,7 @@ Last-Update: 2022-06-18
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-@@ -494,7 +493,6 @@
+@@ -494,7 +493,6 @@ public class QuorumSSLTest extends Quoru
}
@TestBothFipsModes
@@ -1057,7 +1097,7 @@ Last-Update: 2022-06-18
public void testQuorumSSL(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
-@@ -517,7 +515,6 @@
+@@ -517,7 +515,6 @@ public class QuorumSSLTest extends Quoru
}
@TestBothFipsModes
@@ -1065,7 +1105,7 @@ Last-Update: 2022-06-18
public void testQuorumSSL_withPasswordFromFile(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
-@@ -543,7 +540,6 @@
+@@ -543,7 +540,6 @@ public class QuorumSSLTest extends Quoru
}
@TestBothFipsModes
@@ -1073,7 +1113,7 @@ Last-Update: 2022-06-18
public void testQuorumSSLWithMultipleAddresses(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
-@@ -570,7 +566,6 @@
+@@ -570,7 +566,6 @@ public class QuorumSSLTest extends Quoru
@TestBothFipsModes
@@ -1081,7 +1121,7 @@ Last-Update: 2022-06-18
public void testRollingUpgrade(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
-@@ -620,7 +615,6 @@
+@@ -620,7 +615,6 @@ public class QuorumSSLTest extends Quoru
}
@TestNoFipsOnly
@@ -1089,7 +1129,7 @@ Last-Update: 2022-06-18
public void testHostnameVerificationWithInvalidHostname(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
String badhostnameKeystorePath = tmpDir + "/badhost.jks";
-@@ -638,7 +632,6 @@
+@@ -638,7 +632,6 @@ public class QuorumSSLTest extends Quoru
}
@TestNoFipsOnly
@@ -1097,7 +1137,7 @@ Last-Update: 2022-06-18
public void testHostnameVerificationWithInvalidIPAddress(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
String badhostnameKeystorePath = tmpDir + "/badhost.jks";
-@@ -656,7 +649,6 @@
+@@ -656,7 +649,6 @@ public class QuorumSSLTest extends Quoru
}
@TestNoFipsOnly
@@ -1105,7 +1145,7 @@ Last-Update: 2022-06-18
public void testHostnameVerificationWithInvalidIpAddressAndInvalidHostname(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
-@@ -675,7 +667,6 @@
+@@ -675,7 +667,6 @@ public class QuorumSSLTest extends Quoru
}
@TestNoFipsOnly
@@ -1113,7 +1153,7 @@ Last-Update: 2022-06-18
public void testHostnameVerificationForInvalidMultiAddressServerConfig(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
-@@ -697,7 +688,6 @@
+@@ -697,7 +688,6 @@ public class QuorumSSLTest extends Quoru
}
@TestNoFipsOnly
@@ -1121,7 +1161,7 @@ Last-Update: 2022-06-18
public void testHostnameVerificationWithInvalidIpAddressAndValidHostname(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
-@@ -716,7 +706,6 @@
+@@ -716,7 +706,6 @@ public class QuorumSSLTest extends Quoru
}
@TestNoFipsOnly
@@ -1129,7 +1169,7 @@ Last-Update: 2022-06-18
public void testHostnameVerificationWithValidIpAddressAndInvalidHostname(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
-@@ -785,75 +774,6 @@
+@@ -785,75 +774,6 @@ public class QuorumSSLTest extends Quoru
}
@TestBothFipsModes
@@ -1205,7 +1245,7 @@ Last-Update: 2022-06-18
public void testOCSP(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
-@@ -929,7 +849,6 @@
+@@ -929,7 +849,6 @@ public class QuorumSSLTest extends Quoru
}
@TestBothFipsModes
@@ -1213,7 +1253,7 @@ Last-Update: 2022-06-18
public void testCipherSuites(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
-@@ -972,7 +891,6 @@
+@@ -972,7 +891,6 @@ public class QuorumSSLTest extends Quoru
}
@TestBothFipsModes
@@ -1221,9 +1261,11 @@ Last-Update: 2022-06-18
public void testProtocolVersion(boolean fipsEnabled) throws Exception {
System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
System.setProperty(quorumX509Util.getSslProtocolProperty(), "TLSv1.2");
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/RaceConditionTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/RaceConditionTest.java
-@@ -40,7 +40,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/RaceConditionTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/RaceConditionTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/RaceConditionTest.java
+@@ -40,7 +40,6 @@ import org.apache.zookeeper.test.ClientB
import org.apache.zookeeper.txn.DeleteTxn;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -1231,7 +1273,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -60,7 +59,6 @@
+@@ -60,7 +59,6 @@ public class RaceConditionTest extends Q
*/
@Test
@@ -1239,9 +1281,11 @@ Last-Update: 2022-06-18
public void testRaceConditionBetweenLeaderAndAckRequestProcessor() throws Exception {
mt = startQuorum();
// get leader
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigLegacyTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigLegacyTest.java
-@@ -36,7 +36,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigLegacyTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigLegacyTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigLegacyTest.java
+@@ -36,7 +36,6 @@ import org.apache.zookeeper.test.ClientB
import org.apache.zookeeper.test.ReconfigTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -1249,7 +1293,7 @@ Last-Update: 2022-06-18
public class ReconfigLegacyTest extends QuorumPeerTestBase {
-@@ -246,7 +245,6 @@
+@@ -246,7 +245,6 @@ public class ReconfigLegacyTest extends
* @throws Exception
*/
@Test
@@ -1257,9 +1301,11 @@ Last-Update: 2022-06-18
public void testRestartZooKeeperServer() throws Exception {
final int[] clientPorts = new int[SERVER_COUNT];
StringBuilder sb = new StringBuilder();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigRollingRestartCompatibilityTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigRollingRestartCompatibilityTest.java
-@@ -37,7 +37,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigRollingRestartCompatibilityTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigRollingRestartCompatibilityTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigRollingRestartCompatibilityTest.java
+@@ -37,7 +37,6 @@ import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.test.ClientBase;
import org.apache.zookeeper.test.ReconfigTest;
import org.junit.jupiter.api.Test;
@@ -1267,7 +1313,7 @@ Last-Update: 2022-06-18
/**
* ReconfigRollingRestartCompatibilityTest - we want to make sure that users
-@@ -93,7 +92,6 @@
+@@ -93,7 +92,6 @@ public class ReconfigRollingRestartCompa
// Verify no zoo.cfg.dynamic and zoo.cfg.bak files existing locally
// when reconfig feature flag is off by default.
@Test
@@ -1275,7 +1321,7 @@ Last-Update: 2022-06-18
public void testNoLocalDynamicConfigAndBackupFiles() throws InterruptedException, IOException {
int serverCount = 3;
String config = generateNewQuorumConfig(serverCount);
-@@ -123,7 +121,6 @@
+@@ -123,7 +121,6 @@ public class ReconfigRollingRestartCompa
// 2. After upgrade, start the node.
// 3. Do this for every node, one at a time.
@Test
@@ -1283,7 +1329,7 @@ Last-Update: 2022-06-18
public void testRollingRestartWithoutMembershipChange() throws Exception {
int serverCount = 3;
String config = generateNewQuorumConfig(serverCount);
-@@ -156,7 +153,6 @@
+@@ -156,7 +153,6 @@ public class ReconfigRollingRestartCompa
// during the process each node has the expected configuration setting pushed
// via updating local zoo.cfg file.
@Test
@@ -1291,9 +1337,11 @@ Last-Update: 2022-06-18
public void testExtendingQuorumWithNewMembers() throws Exception {
int serverCount = 3;
String config = generateNewQuorumConfig(serverCount);
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
-@@ -33,7 +33,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
+@@ -33,7 +33,6 @@ import org.apache.zookeeper.data.Stat;
import org.apache.zookeeper.test.ClientBase;
import org.apache.zookeeper.test.ReconfigTest;
import org.junit.jupiter.api.Test;
@@ -1301,7 +1349,7 @@ Last-Update: 2022-06-18
public class StandaloneDisabledTest extends QuorumPeerTestBase {
-@@ -55,7 +54,6 @@
+@@ -55,7 +54,6 @@ public class StandaloneDisabledTest exte
* with just a single server.
*/
@Test
@@ -1309,9 +1357,11 @@ Last-Update: 2022-06-18
public void startSingleServerTest() throws Exception {
setUpData();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java
-@@ -33,7 +33,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java
+@@ -33,7 +33,6 @@ import org.apache.kerby.kerberos.kerb.ke
import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
import org.apache.zookeeper.server.quorum.auth.KerberosTestUtils.KerberosConfiguration;
import org.junit.jupiter.api.Test;
@@ -1319,7 +1369,7 @@ Last-Update: 2022-06-18
/*
* This code is originally from HDFS, see the file name TestMiniKdc there
-@@ -46,14 +45,12 @@
+@@ -46,14 +45,12 @@ public class MiniKdcTest extends Kerbero
@Test
@@ -1334,7 +1384,7 @@ Last-Update: 2022-06-18
public void testKeytabGen() throws Exception {
MiniKdc kdc = getKdc();
File workDir = getWorkDir();
-@@ -72,7 +69,6 @@
+@@ -72,7 +69,6 @@ public class MiniKdcTest extends Kerbero
@Test
@@ -1342,9 +1392,11 @@ Last-Update: 2022-06-18
public void testKerberosLogin() throws Exception {
MiniKdc kdc = getKdc();
File workDir = getWorkDir();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java
-@@ -35,7 +35,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java
+@@ -35,7 +35,6 @@ import org.apache.zookeeper.test.ClientT
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -1352,7 +1404,7 @@ Last-Update: 2022-06-18
/**
* Rolling upgrade should do in three steps:
-@@ -85,7 +84,6 @@
+@@ -85,7 +84,6 @@ public class QuorumAuthUpgradeTest exten
* peer1 -> quorum.auth.enableSasl=false
*/
@Test
@@ -1360,7 +1412,7 @@ Last-Update: 2022-06-18
public void testNullAuthLearnerServer() throws Exception {
Map<String, String> authConfigs = new HashMap<>();
authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "false");
-@@ -104,7 +102,6 @@
+@@ -104,7 +102,6 @@ public class QuorumAuthUpgradeTest exten
* peer1 -> quorum.auth.enableSasl=false, quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
*/
@Test
@@ -1368,7 +1420,7 @@ Last-Update: 2022-06-18
public void testAuthLearnerAgainstNullAuthServer() throws Exception {
Map<String, String> authConfigs = new HashMap<>();
authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
-@@ -123,7 +120,6 @@
+@@ -123,7 +120,6 @@ public class QuorumAuthUpgradeTest exten
* peer1 -> quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
*/
@Test
@@ -1376,7 +1428,7 @@ Last-Update: 2022-06-18
public void testAuthLearnerAgainstNoAuthRequiredServer() throws Exception {
Map<String, String> authConfigs = new HashMap<>();
authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
-@@ -142,7 +138,6 @@
+@@ -142,7 +138,6 @@ public class QuorumAuthUpgradeTest exten
* peer1 -> quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=true, quorum.auth.serverRequireSasl=true
*/
@Test
@@ -1384,7 +1436,7 @@ Last-Update: 2022-06-18
public void testAuthLearnerServer() throws Exception {
Map<String, String> authConfigs = new HashMap<>();
authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
-@@ -173,7 +168,6 @@
+@@ -173,7 +168,6 @@ public class QuorumAuthUpgradeTest exten
* Now, all the servers are fully upgraded and running in secured mode.
*/
@Test
@@ -1392,9 +1444,11 @@ Last-Update: 2022-06-18
public void testRollingUpgrade() throws Exception {
// Start peer0,1,2 servers with quorum.auth.enableSasl=false and
// quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java
-@@ -37,7 +37,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java
+@@ -37,7 +37,6 @@ import org.apache.zookeeper.test.ClientB
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -1402,7 +1456,7 @@ Last-Update: 2022-06-18
public class QuorumDigestAuthTest extends QuorumAuthTestBase {
-@@ -79,7 +78,6 @@
+@@ -79,7 +78,6 @@ public class QuorumDigestAuthTest extend
* Test to verify that server is able to start with valid credentials
*/
@Test
@@ -1410,7 +1464,7 @@ Last-Update: 2022-06-18
public void testValidCredentials() throws Exception {
Map<String, String> authConfigs = new HashMap<>();
authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
-@@ -101,7 +99,6 @@
+@@ -101,7 +99,6 @@ public class QuorumDigestAuthTest extend
* when using multiple Quorum / Election addresses
*/
@Test
@@ -1418,7 +1472,7 @@ Last-Update: 2022-06-18
public void testValidCredentialsWithMultiAddresses() throws Exception {
Map<String, String> authConfigs = new HashMap<>();
authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
-@@ -124,7 +121,6 @@
+@@ -124,7 +121,6 @@ public class QuorumDigestAuthTest extend
* Quorum will talk each other even if the authentication is not succeeded
*/
@Test
@@ -1426,7 +1480,7 @@ Last-Update: 2022-06-18
public void testSaslNotRequiredWithInvalidCredentials() throws Exception {
Map<String, String> authConfigs = new HashMap<>();
authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearnerInvalid");
-@@ -146,7 +142,6 @@
+@@ -146,7 +142,6 @@ public class QuorumDigestAuthTest extend
* quorum.auth.learnerRequireSasl=true
*/
@Test
@@ -1434,7 +1488,7 @@ Last-Update: 2022-06-18
public void testSaslRequiredInvalidCredentials() throws Exception {
Map<String, String> authConfigs = new HashMap<>();
authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearnerInvalid");
-@@ -167,7 +162,6 @@
+@@ -167,7 +162,6 @@ public class QuorumDigestAuthTest extend
* enabled while enabling quorum server require sasl.
*/
@Test
@@ -1442,7 +1496,7 @@ Last-Update: 2022-06-18
public void testEnableQuorumServerRequireSaslWithoutQuorumLearnerRequireSasl() throws Exception {
Map<String, String> authConfigs = new HashMap<>();
authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearner");
-@@ -196,7 +190,6 @@
+@@ -196,7 +190,6 @@ public class QuorumDigestAuthTest extend
* enabled while enabling quorum server require sasl.
*/
@Test
@@ -1450,9 +1504,11 @@ Last-Update: 2022-06-18
public void testEnableQuorumAuthenticationConfigurations() throws Exception {
Map<String, String> authConfigs = new HashMap<>();
authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearner");
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
-@@ -33,7 +33,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
+@@ -33,7 +33,6 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -1460,7 +1516,7 @@ Last-Update: 2022-06-18
public class QuorumKerberosAuthTest extends KerberosSecurityTestcase {
-@@ -110,7 +109,6 @@
+@@ -110,7 +109,6 @@ public class QuorumKerberosAuthTest exte
* Test to verify that server is able to start with valid credentials
*/
@Test
@@ -1468,7 +1524,7 @@ Last-Update: 2022-06-18
public void testValidCredentials() throws Exception {
String serverPrincipal = KerberosTestUtils.getServerPrincipal();
serverPrincipal = serverPrincipal.substring(0, serverPrincipal.lastIndexOf("@"));
-@@ -134,7 +132,6 @@
+@@ -134,7 +132,6 @@ public class QuorumKerberosAuthTest exte
* when using multiple Quorum / Election addresses
*/
@Test
@@ -1476,9 +1532,11 @@ Last-Update: 2022-06-18
public void testValidCredentialsWithMultiAddresses() throws Exception {
String serverPrincipal = KerberosTestUtils.getServerPrincipal();
serverPrincipal = serverPrincipal.substring(0, serverPrincipal.lastIndexOf("@"));
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
-@@ -36,7 +36,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
+@@ -36,7 +36,6 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -1486,7 +1544,7 @@ Last-Update: 2022-06-18
public class QuorumKerberosHostBasedAuthTest extends KerberosSecurityTestcase {
-@@ -153,7 +152,6 @@
+@@ -153,7 +152,6 @@ public class QuorumKerberosHostBasedAuth
* Test to verify that server is able to start with valid credentials
*/
@Test
@@ -1494,7 +1552,7 @@ Last-Update: 2022-06-18
public void testValidCredentials() throws Exception {
String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
Map<String, String> authConfigs = new HashMap<>();
-@@ -176,7 +174,6 @@
+@@ -176,7 +174,6 @@ public class QuorumKerberosHostBasedAuth
* when using multiple Quorum / Election addresses
*/
@Test
@@ -1502,7 +1560,7 @@ Last-Update: 2022-06-18
public void testValidCredentialsWithMultiAddresses() throws Exception {
String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
Map<String, String> authConfigs = new HashMap<>();
-@@ -198,7 +195,6 @@
+@@ -198,7 +195,6 @@ public class QuorumKerberosHostBasedAuth
* Test to verify that the bad server connection to the quorum should be rejected.
*/
@Test
@@ -1510,7 +1568,7 @@ Last-Update: 2022-06-18
public void testConnectBadServer() throws Exception {
String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
Map<String, String> authConfigs = new HashMap<>();
-@@ -246,7 +242,6 @@
+@@ -246,7 +242,6 @@ public class QuorumKerberosHostBasedAuth
* Test to verify that the bad server connection to the quorum should be rejected.
*/
@Test
@@ -1518,9 +1576,11 @@ Last-Update: 2022-06-18
public void testConnectHostlessPrincipalBadServer() throws Exception {
String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
Map<String, String> authConfigs = new HashMap<>();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/JvmPauseMonitorTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/JvmPauseMonitorTest.java
-@@ -24,7 +24,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/JvmPauseMonitorTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/JvmPauseMonitorTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/JvmPauseMonitorTest.java
+@@ -24,7 +24,6 @@ import static org.mockito.Mockito.when;
import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -1528,7 +1588,7 @@ Last-Update: 2022-06-18
public class JvmPauseMonitorTest {
-@@ -34,7 +33,6 @@
+@@ -34,7 +33,6 @@ public class JvmPauseMonitorTest {
private JvmPauseMonitor pauseMonitor;
@Test
@@ -1536,7 +1596,7 @@ Last-Update: 2022-06-18
public void testJvmPauseMonitorExceedInfoThreshold() throws InterruptedException {
QuorumPeerConfig qpConfig = mock(QuorumPeerConfig.class);
when(qpConfig.getJvmPauseSleepTimeMs()).thenReturn(sleepTime);
-@@ -52,7 +50,6 @@
+@@ -52,7 +50,6 @@ public class JvmPauseMonitorTest {
}
@Test
@@ -1544,9 +1604,11 @@ Last-Update: 2022-06-18
public void testJvmPauseMonitorExceedWarnThreshold() throws InterruptedException {
QuorumPeerConfig qpConfig = mock(QuorumPeerConfig.class);
when(qpConfig.getJvmPauseSleepTimeMs()).thenReturn(sleepTime);
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchManagerTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchManagerTest.java
-@@ -40,7 +40,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchManagerTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchManagerTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchManagerTest.java
+@@ -40,7 +40,6 @@ import org.apache.zookeeper.server.Serve
import org.apache.zookeeper.server.ServerMetrics;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -1554,7 +1616,7 @@ Last-Update: 2022-06-18
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-@@ -229,7 +228,6 @@
+@@ -229,7 +228,6 @@ public class WatchManagerTest extends ZK
*/
@ParameterizedTest
@MethodSource("data")
@@ -1562,7 +1624,7 @@ Last-Update: 2022-06-18
public void testAddAndTriggerWatcher(String className) throws IOException {
IWatchManager manager = getWatchManager(className);
int paths = 1;
-@@ -290,7 +288,6 @@
+@@ -290,7 +288,6 @@ public class WatchManagerTest extends ZK
*/
@ParameterizedTest
@MethodSource("data")
@@ -1570,7 +1632,7 @@ Last-Update: 2022-06-18
public void testRemoveWatcherOnPath(String className) throws IOException {
IWatchManager manager = getWatchManager(className);
int paths = 10;
-@@ -661,7 +658,6 @@
+@@ -661,7 +658,6 @@ public class WatchManagerTest extends ZK
*/
@ParameterizedTest
@MethodSource("data")
@@ -1578,9 +1640,11 @@ Last-Update: 2022-06-18
public void testDeadWatchers(String className) throws IOException {
System.setProperty("zookeeper.watcherCleanThreshold", "10");
System.setProperty("zookeeper.watcherCleanIntervalInSeconds", "1");
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java
-@@ -32,7 +32,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java
+@@ -32,7 +32,6 @@ import org.apache.zookeeper.ZooKeeper;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -1588,7 +1652,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -188,7 +187,6 @@
+@@ -188,7 +187,6 @@ public class DisconnectedWatcherTest ext
// @see jira issue ZOOKEEPER-706. Test auto reset of a large number of
// watches which require multiple SetWatches calls.
@Test
@@ -1596,9 +1660,11 @@ Last-Update: 2022-06-18
public void testManyChildWatchersAutoReset() throws Exception {
zk2 = createClient(watcher2);
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java
-@@ -33,7 +33,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java
+@@ -33,7 +33,6 @@ import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.common.IOUtils;
import org.apache.zookeeper.common.X509Exception.SSLContextException;
import org.junit.jupiter.api.Test;
@@ -1606,7 +1672,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -43,7 +42,6 @@
+@@ -43,7 +42,6 @@ public class FourLetterWordsTest extends
/** Test the various four letter words */
@Test
@@ -1614,7 +1680,7 @@ Last-Update: 2022-06-18
public void testFourLetterWords() throws Exception {
verify("ruok", "imok");
verify("envi", "java.version");
-@@ -127,7 +125,6 @@
+@@ -127,7 +125,6 @@ public class FourLetterWordsTest extends
}
@Test
@@ -1622,7 +1688,7 @@ Last-Update: 2022-06-18
public void testValidateStatOutput() throws Exception {
ZooKeeper zk1 = createClient();
ZooKeeper zk2 = createClient();
-@@ -171,7 +168,6 @@
+@@ -171,7 +168,6 @@ public class FourLetterWordsTest extends
}
@Test
@@ -1630,7 +1696,7 @@ Last-Update: 2022-06-18
public void testValidateConsOutput() throws Exception {
ZooKeeper zk1 = createClient();
ZooKeeper zk2 = createClient();
-@@ -193,7 +189,6 @@
+@@ -193,7 +189,6 @@ public class FourLetterWordsTest extends
}
@Test
@@ -1638,7 +1704,7 @@ Last-Update: 2022-06-18
public void testValidateSocketTimeout() throws Exception {
/**
* testing positive scenario that even with timeout parameter the
-@@ -204,7 +199,6 @@
+@@ -204,7 +199,6 @@ public class FourLetterWordsTest extends
}
@Test
@@ -1646,9 +1712,11 @@ Last-Update: 2022-06-18
public void testSetTraceMask() throws Exception {
String gtmkResp = sendRequest("gtmk");
assertNotNull(gtmkResp);
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java
-@@ -25,7 +25,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java
+@@ -25,7 +25,6 @@ import org.apache.zookeeper.TestableZooK
import org.apache.zookeeper.common.X509Exception.SSLContextException;
import org.apache.zookeeper.server.command.FourLetterCommands;
import org.junit.jupiter.api.Test;
@@ -1656,7 +1724,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -40,7 +39,6 @@
+@@ -40,7 +39,6 @@ public class FourLetterWordsWhiteListTes
* which other tests depend on.).
*/
@Test
@@ -1664,7 +1732,7 @@ Last-Update: 2022-06-18
public void testFourLetterWordsAllDisabledByDefault() throws Exception {
stopServer();
FourLetterCommands.resetWhiteList();
-@@ -65,7 +63,6 @@
+@@ -65,7 +63,6 @@ public class FourLetterWordsWhiteListTes
}
@Test
@@ -1672,7 +1740,7 @@ Last-Update: 2022-06-18
public void testFourLetterWordsEnableSomeCommands() throws Exception {
stopServer();
FourLetterCommands.resetWhiteList();
-@@ -93,7 +90,6 @@
+@@ -93,7 +90,6 @@ public class FourLetterWordsWhiteListTes
}
@Test
@@ -1680,7 +1748,7 @@ Last-Update: 2022-06-18
public void testISROEnabledWhenReadOnlyModeEnabled() throws Exception {
stopServer();
FourLetterCommands.resetWhiteList();
-@@ -105,7 +101,6 @@
+@@ -105,7 +101,6 @@ public class FourLetterWordsWhiteListTes
}
@Test
@@ -1688,7 +1756,7 @@ Last-Update: 2022-06-18
public void testFourLetterWordsInvalidConfiguration() throws Exception {
stopServer();
FourLetterCommands.resetWhiteList();
-@@ -121,7 +116,6 @@
+@@ -121,7 +116,6 @@ public class FourLetterWordsWhiteListTes
}
@Test
@@ -1696,7 +1764,7 @@ Last-Update: 2022-06-18
public void testFourLetterWordsEnableAllCommandsThroughAsterisk() throws Exception {
stopServer();
FourLetterCommands.resetWhiteList();
-@@ -131,7 +125,6 @@
+@@ -131,7 +125,6 @@ public class FourLetterWordsWhiteListTes
}
@Test
@@ -1704,9 +1772,11 @@ Last-Update: 2022-06-18
public void testFourLetterWordsEnableAllCommandsThroughExplicitList() throws Exception {
stopServer();
FourLetterCommands.resetWhiteList();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java
-@@ -61,7 +61,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java
+@@ -61,7 +61,6 @@ import org.apache.zookeeper.data.Id;
import org.apache.zookeeper.data.Stat;
import org.apache.zookeeper.server.SyncRequestProcessor;
import org.junit.jupiter.api.BeforeEach;
@@ -1714,7 +1784,7 @@ Last-Update: 2022-06-18
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.slf4j.Logger;
-@@ -192,7 +191,6 @@
+@@ -192,7 +191,6 @@ public class MultiOperationTest extends
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -1722,7 +1792,7 @@ Last-Update: 2022-06-18
public void testInvalidPath(boolean useAsync) throws Exception {
List<Integer> expectedResultCodes = new ArrayList<>();
expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue());
-@@ -295,7 +293,6 @@
+@@ -295,7 +293,6 @@ public class MultiOperationTest extends
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -1730,7 +1800,7 @@ Last-Update: 2022-06-18
public void testBlankPath(boolean useAsync) throws Exception {
List<Integer> expectedResultCodes = new ArrayList<>();
expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue());
-@@ -318,7 +315,6 @@
+@@ -318,7 +315,6 @@ public class MultiOperationTest extends
*/
@ParameterizedTest
@ValueSource(booleans = {true, false})
@@ -1738,9 +1808,11 @@ Last-Update: 2022-06-18
public void testInvalidCreateModeFlag(boolean useAsync) throws Exception {
List<Integer> expectedResultCodes = new ArrayList<>();
expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue());
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java
-@@ -37,7 +37,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java
+@@ -37,7 +37,6 @@ import org.apache.zookeeper.server.quoru
import org.apache.zookeeper.server.quorum.QuorumPeerTestBase;
import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
import org.junit.jupiter.api.Test;
@@ -1748,7 +1820,7 @@ Last-Update: 2022-06-18
/**
* This class tests the non-recoverable error behavior of quorum server.
-@@ -52,7 +51,6 @@
+@@ -52,7 +51,6 @@ public class NonRecoverableErrorTest ext
* writing transaction log), ZooKeeper is still available.
*/
@Test
@@ -1756,9 +1828,11 @@ Last-Update: 2022-06-18
public void testZooKeeperServiceAvailableOnLeader() throws Exception {
int SERVER_COUNT = 3;
final int[] clientPorts = new int[SERVER_COUNT];
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
-@@ -43,7 +43,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
+@@ -43,7 +43,6 @@ import org.apache.zookeeper.test.ClientB
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -1766,7 +1840,7 @@ Last-Update: 2022-06-18
import org.slf4j.LoggerFactory;
public class ReadOnlyModeTest extends ZKTestCase {
-@@ -67,7 +66,6 @@
+@@ -67,7 +66,6 @@ public class ReadOnlyModeTest extends ZK
* Test write operations using multi request.
*/
@Test
@@ -1774,7 +1848,7 @@ Last-Update: 2022-06-18
public void testMultiTransaction() throws Exception {
qu.enableLocalSession(true);
qu.startQuorum();
-@@ -111,7 +109,6 @@
+@@ -111,7 +109,6 @@ public class ReadOnlyModeTest extends ZK
* during read-only mode, then regains a quorum and tries to write again.
*/
@Test
@@ -1782,7 +1856,7 @@ Last-Update: 2022-06-18
public void testReadOnlyClient() throws Exception {
qu.enableLocalSession(true);
qu.startQuorum();
-@@ -165,7 +162,6 @@
+@@ -165,7 +162,6 @@ public class ReadOnlyModeTest extends ZK
* ConnectedReadOnly state notification.
*/
@Test
@@ -1790,7 +1864,7 @@ Last-Update: 2022-06-18
public void testConnectionEvents() throws Exception {
qu.enableLocalSession(true);
qu.startQuorum();
-@@ -210,7 +206,6 @@
+@@ -210,7 +206,6 @@ public class ReadOnlyModeTest extends ZK
* the user.
*/
@Test
@@ -1798,7 +1872,7 @@ Last-Update: 2022-06-18
public void testSessionEstablishment() throws Exception {
qu.enableLocalSession(true);
qu.startQuorum();
-@@ -244,7 +239,6 @@
+@@ -244,7 +239,6 @@ public class ReadOnlyModeTest extends ZK
}
@Test
@@ -1806,7 +1880,7 @@ Last-Update: 2022-06-18
public void testGlobalSessionInRO() throws Exception {
qu.startQuorum();
-@@ -287,7 +281,6 @@
+@@ -287,7 +281,6 @@ public class ReadOnlyModeTest extends ZK
*/
@SuppressWarnings("deprecation")
@Test
@@ -1814,9 +1888,11 @@ Last-Update: 2022-06-18
public void testSeekForRwServer() throws Exception {
qu.enableLocalSession(true);
qu.startQuorum();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
-@@ -37,7 +37,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
+@@ -37,7 +37,6 @@ import org.apache.zookeeper.server.quoru
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -1824,7 +1900,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -89,7 +88,6 @@
+@@ -89,7 +88,6 @@ public class ReconfigExceptionTest exten
}
@Test
@@ -1832,7 +1908,7 @@ Last-Update: 2022-06-18
public void testReconfigDisabled() throws InterruptedException {
QuorumPeerConfig.setReconfigEnabled(false);
-@@ -111,7 +109,6 @@
+@@ -111,7 +109,6 @@ public class ReconfigExceptionTest exten
}
@Test
@@ -1840,7 +1916,7 @@ Last-Update: 2022-06-18
public void testReconfigFailWithoutAuth() throws InterruptedException {
try {
reconfigPort();
-@@ -123,7 +120,6 @@
+@@ -123,7 +120,6 @@ public class ReconfigExceptionTest exten
}
@Test
@@ -1848,7 +1924,7 @@ Last-Update: 2022-06-18
public void testReconfigEnabledWithSuperUser() throws InterruptedException {
try {
zkAdmin.addAuthInfo("digest", "super:test".getBytes());
-@@ -134,7 +130,6 @@
+@@ -134,7 +130,6 @@ public class ReconfigExceptionTest exten
}
@Test
@@ -1856,7 +1932,7 @@ Last-Update: 2022-06-18
public void testReconfigFailWithAuthWithNoACL() throws InterruptedException {
resetZKAdmin();
-@@ -149,7 +144,6 @@
+@@ -149,7 +144,6 @@ public class ReconfigExceptionTest exten
}
@Test
@@ -1864,7 +1940,7 @@ Last-Update: 2022-06-18
public void testReconfigEnabledWithAuthAndWrongACL() throws InterruptedException {
resetZKAdmin();
-@@ -168,7 +162,6 @@
+@@ -168,7 +162,6 @@ public class ReconfigExceptionTest exten
}
@Test
@@ -1872,9 +1948,11 @@ Last-Update: 2022-06-18
public void testReconfigEnabledWithAuthAndACL() throws InterruptedException {
resetZKAdmin();
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java
-@@ -33,7 +33,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java
+@@ -33,7 +33,6 @@ import org.apache.zookeeper.server.quoru
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -1882,7 +1960,7 @@ Last-Update: 2022-06-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -75,7 +74,6 @@
+@@ -75,7 +74,6 @@ public class ReconfigMisconfigTest exten
}
@Test
@@ -1890,9 +1968,11 @@ Last-Update: 2022-06-18
public void testReconfigFailWithoutSuperuserPasswordConfiguredOnServer() throws InterruptedException {
// This tests the case where ZK ensemble does not have the super user's password configured.
// Reconfig should fail as the super user has to be explicitly configured via
---- a/zookeeper-server/src/test/java/org/apache/zookeeper/util/TestCircularBlockingQueue.java
-+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/util/TestCircularBlockingQueue.java
-@@ -24,7 +24,6 @@
+Index: zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/util/TestCircularBlockingQueue.java
+===================================================================
+--- zookeeper.orig/zookeeper-server/src/test/java/org/apache/zookeeper/util/TestCircularBlockingQueue.java
++++ zookeeper/zookeeper-server/src/test/java/org/apache/zookeeper/util/TestCircularBlockingQueue.java
+@@ -24,7 +24,6 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import org.junit.jupiter.api.Test;
@@ -1900,7 +1980,7 @@ Last-Update: 2022-06-18
public class TestCircularBlockingQueue {
-@@ -48,7 +47,6 @@
+@@ -48,7 +47,6 @@ public class TestCircularBlockingQueue {
}
@Test
View it on GitLab: https://salsa.debian.org/java-team/zookeeper/-/commit/bd70fa9e6442cf3149fcabe9d9f0b04158ea628e
--
View it on GitLab: https://salsa.debian.org/java-team/zookeeper/-/commit/bd70fa9e6442cf3149fcabe9d9f0b04158ea628e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240325/ed99de21/attachment.htm>
More information about the pkg-java-commits
mailing list