[Git][java-team/zookeeper][master] 2 commits: Raising a bit some time limits in the tests

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Java Maintainers / zookeeper


Commits:
f73b1006 by Pierre Gruet at 2022-06-29T20:45:33+02:00
Raising a bit some time limits in the tests

- - - - -
5b2fbc65 by Pierre Gruet at 2022-06-29T23:24:25+02:00
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/patches/31-enlarge-time-limit-in-test.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+zookeeper (3.8.0-3) unstable; urgency=medium
+
+  * Team upload
+  * Raising a bit some time limits in tests, failures can happen depending
+    on the buildds
+
+ -- Pierre Gruet <pgt at debian.org>  Wed, 29 Jun 2022 21:44:22 +0200
+
 zookeeper (3.8.0-2) unstable; urgency=medium
 
   * Team upload


=====================================
debian/patches/31-enlarge-time-limit-in-test.patch
=====================================
@@ -1,12 +1,19 @@
-Description: raising the time limit in a test by a few seconds
+Description: reasonably raising some time limits in tests
+ The default time limits may be too low for some machines
 Author: Pierre Gruet <pgt at debian.org>
 Forwarded: not-needed
-Last-Update: 2022-06-25
+Last-Update: 2022-06-29
 
 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/RequestPathMetricsCollectorTest.java
 +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/RequestPathMetricsCollectorTest.java
-@@ -444,8 +444,8 @@
-         executor.awaitTermination(10, TimeUnit.MILLISECONDS);
+@@ -440,12 +440,12 @@
+                 () -> requestPathMetricsCollector.registerRequest(getChildren, "/path1/path2/path" + rand.nextInt(10)));
+         }
+         executor.shutdown();
+-        //wait for at most 10 mill seconds
+-        executor.awaitTermination(10, TimeUnit.MILLISECONDS);
++        //wait for at most 100 mill seconds
++        executor.awaitTermination(100, TimeUnit.MILLISECONDS);
          assertTrue(executor.isTerminated());
          Long endTime = System.currentTimeMillis();
 -        //less than 2 seconds total time
@@ -16,3 +23,25 @@ Last-Update: 2022-06-25
      }
  
  }
+--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/UnifiedServerSocketModeDetectionTest.java
++++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/UnifiedServerSocketModeDetectionTest.java
+@@ -149,7 +149,7 @@
+         forceClose(serverSideSocket);
+         forceClose(clientSocket);
+         workerPool.shutdown();
+-        workerPool.awaitTermination(1000, TimeUnit.MILLISECONDS);
++        workerPool.awaitTermination(2000, TimeUnit.MILLISECONDS);
+         x509Util.close();
+     }
+ 
+--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/UnifiedServerSocketTest.java
++++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/UnifiedServerSocketTest.java
+@@ -190,7 +190,7 @@
+ 
+         public void shutdown(long millis) throws InterruptedException {
+             forceClose(serverSocket); // this should break the run() loop
+-            workerPool.awaitTermination(millis, TimeUnit.MILLISECONDS);
++            workerPool.awaitTermination(2L * millis, TimeUnit.MILLISECONDS);
+             this.join(millis);
+         }
+ 



View it on GitLab: https://salsa.debian.org/java-team/zookeeper/-/compare/9b3822ba271b94cd5ab34373d50ff8c9ce79a6e2...5b2fbc65c4be1e98ababbd09a57f4f40117de73f

-- 
View it on GitLab: https://salsa.debian.org/java-team/zookeeper/-/compare/9b3822ba271b94cd5ab34373d50ff8c9ce79a6e2...5b2fbc65c4be1e98ababbd09a57f4f40117de73f
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/20220629/449cb52c/attachment.htm>