From 068b0e772899ac95051e10d611568b331e8b1c01 Mon Sep 17 00:00:00 2001
From: Frederic Bregier <frederic.bregier@waarp.fr>
Date: Thu, 7 Oct 2021 21:36:17 +0200
Subject: [PATCH] Fix tests to pass on CICD under heavy load

Some tests were done by assuming too much the CICD host was not used
by other CICD workloads. Unfortunately those tests, while valid in
real condition, were assuming too short times to pass.
The tests are adapted a bit to be more tolerant on CPU usage.

Also update dependencies.
---
 .../waarp/common/utility/ProcessesTest.java   |  2 +-
 .../NetworkClientCompressionVs35Test.java     | 46 +++++++++++----
 .../NetworkClientOnlyBothCompressionTest.java | 46 +++++++++++----
 .../NetworkClientOnlyOneCompressionTest.java  | 46 +++++++++++----
 .../protocol/junit/NetworkClientTest.java     | 57 ++++++++++++++-----
 .../monitoring/HttpMonitoringAbstract.java    | 42 +++++++++++---
 doc/waarp-r66/source/changes.rst              |  4 +-
 .../source/interface/rest/general.rst         |  2 +-
 pom.xml                                       | 45 ++++++++-------
 9 files changed, 213 insertions(+), 77 deletions(-)

diff --git a/WaarpCommon/src/test/java/org/waarp/common/utility/ProcessesTest.java b/WaarpCommon/src/test/java/org/waarp/common/utility/ProcessesTest.java
index 1094ab161a..f49c2580b4 100644
--- a/WaarpCommon/src/test/java/org/waarp/common/utility/ProcessesTest.java
+++ b/WaarpCommon/src/test/java/org/waarp/common/utility/ProcessesTest.java
@@ -39,7 +39,7 @@ public class ProcessesTest {
 
   public boolean waitForPidDone(int pid) {
     int i;
-    for (i = 0; i < 10; i++) {
+    for (i = 0; i < 50; i++) {
       try {
         Thread.sleep(TIMEMS);
       } catch (InterruptedException ignored) {//NOSONAR
diff --git a/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientCompressionVs35Test.java b/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientCompressionVs35Test.java
index 93f4cea0a4..66189ca366 100644
--- a/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientCompressionVs35Test.java
+++ b/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientCompressionVs35Test.java
@@ -900,7 +900,7 @@ public void test6_RecvUsingTrafficShaping() throws IOException {
     totestBig.delete();
   }
 
-  private void test_Spooled(final SpooledThread spooledThread, final int factor)
+  private void test_Spooled(final SpooledThread spooledThread)
       throws IOException, InterruptedException {
     final int size = 200;
     Configuration.configuration.changeNetworkLimit(0, 0, 0, 0, 1000);
@@ -912,25 +912,51 @@ private void test_Spooled(final SpooledThread spooledThread, final int factor)
     spooledThread.future = future;
     spooledThread.start();
     Thread.sleep(200);
+    int cpt = 0;
     logger.warn("1rst file");
     final File totestBig = generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size);
-    Thread.sleep(4000 / factor);
+    cpt++;
+    for (int i = 0; i < 100; i++) {
+      if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+        Thread.sleep(200);
+      } else {
+        break;
+      }
+    }
     logger.warn("1rst file delete");
     totestBig.delete();
     Thread.sleep(2000);
     logger.warn("Second file");
     generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size);
-    Thread.sleep(4000 / factor);
-    logger.warn("Third file");
+    cpt++;
+    for (int i = 0; i < 100; i++) {
+      if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+        Thread.sleep(200);
+      } else {
+        break;
+      }
+    }
+    logger.warn("Third file modifying second file");
     generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size + 1,
         "abcdefghij");
-    Thread.sleep(4000 / factor);
+    if (spooledThread.ignoreAlreadyUsed) {
+      Thread.sleep(2000);
+    } else {
+      cpt++;
+      for (int i = 0; i < 100; i++) {
+        if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+          Thread.sleep(200);
+        } else {
+          break;
+        }
+      }
+    }
     logger.warn("Third file deleted");
     totestBig.delete();
-    Thread.sleep(2000 / factor);
+    Thread.sleep(1000);
     generateOutFile(stop.getAbsolutePath(), 10);
     future.awaitOrInterruptible();
     assertTrue(future.isSuccess());
@@ -948,7 +974,7 @@ public void test70_Spooled() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = false;
     spooledThread.submit = false;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(3, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -959,7 +985,7 @@ public void test70_SpooledSubmit() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = false;
     spooledThread.submit = true;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(3, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -970,7 +996,7 @@ public void test70_SpooledIgnore() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = true;
     spooledThread.submit = false;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(2, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -982,7 +1008,7 @@ public void test70_SpooledSubmitIgnore()
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = true;
     spooledThread.submit = true;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(2, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
diff --git a/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientOnlyBothCompressionTest.java b/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientOnlyBothCompressionTest.java
index 13dc53df5f..06578e2027 100644
--- a/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientOnlyBothCompressionTest.java
+++ b/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientOnlyBothCompressionTest.java
@@ -1108,7 +1108,7 @@ public void test6_RecvUsingTrafficShapingNoCompress() throws IOException {
     totestBig.delete();
   }
 
-  private void test_Spooled(final SpooledThread spooledThread, final int factor)
+  private void test_Spooled(final SpooledThread spooledThread)
       throws IOException, InterruptedException {
     final int size = 200;
     Configuration.configuration.changeNetworkLimit(0, 0, 0, 0, 1000);
@@ -1120,25 +1120,51 @@ private void test_Spooled(final SpooledThread spooledThread, final int factor)
     spooledThread.future = future;
     spooledThread.start();
     Thread.sleep(200);
+    int cpt = 0;
     logger.warn("1rst file");
     final File totestBig = generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size);
-    Thread.sleep(4000 / factor);
+    cpt++;
+    for (int i = 0; i < 100; i++) {
+      if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+        Thread.sleep(200);
+      } else {
+        break;
+      }
+    }
     logger.warn("1rst file delete");
     totestBig.delete();
     Thread.sleep(2000);
     logger.warn("Second file");
     generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size);
-    Thread.sleep(4000 / factor);
-    logger.warn("Third file");
+    cpt++;
+    for (int i = 0; i < 100; i++) {
+      if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+        Thread.sleep(200);
+      } else {
+        break;
+      }
+    }
+    logger.warn("Third file modifying second file");
     generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size + 1,
         "abcdefghij");
-    Thread.sleep(4000 / factor);
+    if (spooledThread.ignoreAlreadyUsed) {
+      Thread.sleep(2000);
+    } else {
+      cpt++;
+      for (int i = 0; i < 100; i++) {
+        if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+          Thread.sleep(200);
+        } else {
+          break;
+        }
+      }
+    }
     logger.warn("Third file deleted");
     totestBig.delete();
-    Thread.sleep(2000 / factor);
+    Thread.sleep(1000);
     generateOutFile(stop.getAbsolutePath(), 10);
     future.awaitOrInterruptible();
     assertTrue(future.isSuccess());
@@ -1156,7 +1182,7 @@ public void test70_Spooled() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = false;
     spooledThread.submit = false;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(3, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1167,7 +1193,7 @@ public void test70_SpooledSubmit() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = false;
     spooledThread.submit = true;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(3, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1178,7 +1204,7 @@ public void test70_SpooledIgnore() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = true;
     spooledThread.submit = false;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(2, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1190,7 +1216,7 @@ public void test70_SpooledSubmitIgnore()
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = true;
     spooledThread.submit = true;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(2, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
diff --git a/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientOnlyOneCompressionTest.java b/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientOnlyOneCompressionTest.java
index ba00273cb4..b2933009cc 100644
--- a/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientOnlyOneCompressionTest.java
+++ b/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientOnlyOneCompressionTest.java
@@ -1025,7 +1025,7 @@ public void test6_RecvUsingTrafficShaping() throws IOException {
     totestBig.delete();
   }
 
-  private void test_Spooled(final SpooledThread spooledThread, final int factor)
+  private void test_Spooled(final SpooledThread spooledThread)
       throws IOException, InterruptedException {
     final int size = 200;
     Configuration.configuration.changeNetworkLimit(0, 0, 0, 0, 1000);
@@ -1037,25 +1037,51 @@ private void test_Spooled(final SpooledThread spooledThread, final int factor)
     spooledThread.future = future;
     spooledThread.start();
     Thread.sleep(200);
+    int cpt = 0;
     logger.warn("1rst file");
     final File totestBig = generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size);
-    Thread.sleep(4000 / factor);
+    cpt++;
+    for (int i = 0; i < 100; i++) {
+      if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+        Thread.sleep(200);
+      } else {
+        break;
+      }
+    }
     logger.warn("1rst file delete");
     totestBig.delete();
     Thread.sleep(2000);
     logger.warn("Second file");
     generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size);
-    Thread.sleep(4000 / factor);
-    logger.warn("Third file");
+    cpt++;
+    for (int i = 0; i < 100; i++) {
+      if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+        Thread.sleep(200);
+      } else {
+        break;
+      }
+    }
+    logger.warn("Third file modifying second file");
     generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size + 1,
         "abcdefghij");
-    Thread.sleep(4000 / factor);
+    if (spooledThread.ignoreAlreadyUsed) {
+      Thread.sleep(2000);
+    } else {
+      cpt++;
+      for (int i = 0; i < 100; i++) {
+        if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+          Thread.sleep(200);
+        } else {
+          break;
+        }
+      }
+    }
     logger.warn("Third file deleted");
     totestBig.delete();
-    Thread.sleep(2000 / factor);
+    Thread.sleep(1000);
     generateOutFile(stop.getAbsolutePath(), 10);
     future.awaitOrInterruptible();
     assertTrue(future.isSuccess());
@@ -1073,7 +1099,7 @@ public void test70_Spooled() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = false;
     spooledThread.submit = false;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(3, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1084,7 +1110,7 @@ public void test70_SpooledSubmit() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = false;
     spooledThread.submit = true;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(3, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1095,7 +1121,7 @@ public void test70_SpooledIgnore() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = true;
     spooledThread.submit = false;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(2, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1107,7 +1133,7 @@ public void test70_SpooledSubmitIgnore()
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = true;
     spooledThread.submit = true;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(2, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
diff --git a/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientTest.java b/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientTest.java
index 286e2b98c7..286757ce3b 100644
--- a/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientTest.java
+++ b/WaarpR66/src/test/java/org/waarp/openr66/protocol/junit/NetworkClientTest.java
@@ -1279,7 +1279,7 @@ public void test6_RecvUsingTrafficShaping() throws IOException {
     totestBig.delete();
   }
 
-  private void test_Spooled(final SpooledThread spooledThread, final int factor)
+  private void test_Spooled(final SpooledThread spooledThread)
       throws IOException, InterruptedException {
     final int size = 200;
     Configuration.configuration.changeNetworkLimit(0, 0, 0, 0, 1000);
@@ -1291,25 +1291,54 @@ private void test_Spooled(final SpooledThread spooledThread, final int factor)
     spooledThread.future = future;
     spooledThread.start();
     Thread.sleep(200);
+    int cpt = 0;
     logger.warn("1rst file");
     final File totestBig = generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size);
-    Thread.sleep(4000 / factor);
+    cpt++;
+    for (int i = 0; i < 100; i++) {
+      if (spooledThread.spooledDirectoryTransfer.getSent() +
+          spooledThread.spooledDirectoryTransfer.getError() != cpt) {
+        Thread.sleep(200);
+      } else {
+        break;
+      }
+    }
     logger.warn("1rst file delete");
     totestBig.delete();
     Thread.sleep(2000);
     logger.warn("Second file");
     generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size);
-    Thread.sleep(4000 / factor);
-    logger.warn("Third file");
+    cpt++;
+    for (int i = 0; i < 100; i++) {
+      if (spooledThread.spooledDirectoryTransfer.getSent() +
+          spooledThread.spooledDirectoryTransfer.getError() != cpt) {
+        Thread.sleep(200);
+      } else {
+        break;
+      }
+    }
+    logger.warn("Third file modifying second file");
     generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size + 1,
         "abcdefghij");
-    Thread.sleep(4000 / factor);
+    if (spooledThread.ignoreAlreadyUsed) {
+      Thread.sleep(2000);
+    } else {
+      cpt++;
+      for (int i = 0; i < 100; i++) {
+        if (spooledThread.spooledDirectoryTransfer.getSent() +
+            spooledThread.spooledDirectoryTransfer.getError() != cpt) {
+          Thread.sleep(200);
+        } else {
+          break;
+        }
+      }
+    }
     logger.warn("Third file deleted");
     totestBig.delete();
-    Thread.sleep(2000 / factor);
+    Thread.sleep(1000);
     generateOutFile(stop.getAbsolutePath(), 10);
     future.awaitOrInterruptible();
     assertTrue(future.isSuccess());
@@ -1328,7 +1357,7 @@ public void test70_Spooled() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = false;
     spooledThread.submit = false;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     if (spooledThread.spooledDirectoryTransfer.getSent() != 3) {
       Thread.sleep(100);
       if (spooledThread.spooledDirectoryTransfer.getSent() != 3) {
@@ -1348,7 +1377,7 @@ public void test70_SpooledSubmit() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = false;
     spooledThread.submit = true;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(3, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1359,7 +1388,7 @@ public void test70_SpooledIgnore() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = true;
     spooledThread.submit = false;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(2, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1371,7 +1400,7 @@ public void test70_SpooledSubmitIgnore()
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = true;
     spooledThread.submit = true;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(2, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1385,7 +1414,7 @@ public void test70_SpooledWrongHost()
     spooledThread.submit = false;
     spooledThread.host = "hostbs";
     // spooledThread.waarpHost = null;
-    test_Spooled(spooledThread, 1);
+    test_Spooled(spooledThread);
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getSent());
     assertTrue(3 <= spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1398,7 +1427,7 @@ public void test70_SpooledSubmitWrongHost()
     spooledThread.ignoreAlreadyUsed = false;
     spooledThread.host = "hostbs";
     spooledThread.submit = true;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(3, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1412,7 +1441,7 @@ public void test70_SpooledWrongHostIgnore()
     spooledThread.host = "hostbs";
     spooledThread.submit = false;
     //spooledThread.waarpHost = null;
-    test_Spooled(spooledThread, 1);
+    test_Spooled(spooledThread);
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getSent());
     assertTrue(3 <= spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -1425,7 +1454,7 @@ public void test70_SpooledSubmitWrongHostIgnore()
     spooledThread.ignoreAlreadyUsed = true;
     spooledThread.host = "hostbs";
     spooledThread.submit = true;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(2, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
diff --git a/WaarpR66/src/test/java/org/waarp/openr66/protocol/monitoring/HttpMonitoringAbstract.java b/WaarpR66/src/test/java/org/waarp/openr66/protocol/monitoring/HttpMonitoringAbstract.java
index 76bfeb5b11..3f3ce43226 100644
--- a/WaarpR66/src/test/java/org/waarp/openr66/protocol/monitoring/HttpMonitoringAbstract.java
+++ b/WaarpR66/src/test/java/org/waarp/openr66/protocol/monitoring/HttpMonitoringAbstract.java
@@ -299,7 +299,7 @@ public void test6_RecvUsingTrafficShaping() throws IOException {
     numberTransfer++;
   }
 
-  private void test_Spooled(final SpooledThread spooledThread, final int factor)
+  private void test_Spooled(final SpooledThread spooledThread)
       throws IOException, InterruptedException {
     final int size = 200;
     Configuration.configuration.changeNetworkLimit(0, 0, 0, 0, 1000);
@@ -311,25 +311,51 @@ private void test_Spooled(final SpooledThread spooledThread, final int factor)
     spooledThread.future = future;
     spooledThread.start();
     Thread.sleep(200);
+    int cpt = 0;
     logger.warn("1rst file");
     final File totestBig = generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size);
-    Thread.sleep(4000 / factor);
+    cpt++;
+    for (int i = 0; i < 100; i++) {
+      if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+        Thread.sleep(200);
+      } else {
+        break;
+      }
+    }
     logger.warn("1rst file delete");
     totestBig.delete();
     Thread.sleep(2000);
     logger.warn("Second file");
     generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size);
-    Thread.sleep(4000 / factor);
-    logger.warn("Third file");
+    cpt++;
+    for (int i = 0; i < 100; i++) {
+      if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+        Thread.sleep(200);
+      } else {
+        break;
+      }
+    }
+    logger.warn("Third file modifying second file");
     generateOutFile(
         SpooledThread.TMP_R_66_TEST_OUT_EXAMPLE + "/testTaskBig.txt", size + 1,
         "abcdefghij");
-    Thread.sleep(4000 / factor);
+    if (spooledThread.ignoreAlreadyUsed) {
+      Thread.sleep(2000);
+    } else {
+      cpt++;
+      for (int i = 0; i < 100; i++) {
+        if (spooledThread.spooledDirectoryTransfer.getSent() != cpt) {
+          Thread.sleep(200);
+        } else {
+          break;
+        }
+      }
+    }
     logger.warn("Third file deleted");
     totestBig.delete();
-    Thread.sleep(2000 / factor);
+    Thread.sleep(1000);
     generateOutFile(stop.getAbsolutePath(), 10);
     future.awaitOrInterruptible();
     assertTrue(future.isSuccess());
@@ -348,7 +374,7 @@ public void test70_Spooled() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = false;
     spooledThread.submit = false;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(3, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
@@ -359,7 +385,7 @@ public void test70_SpooledSubmit() throws IOException, InterruptedException {
     SpooledThread spooledThread = new SpooledThread();
     spooledThread.ignoreAlreadyUsed = false;
     spooledThread.submit = true;
-    test_Spooled(spooledThread, 2);
+    test_Spooled(spooledThread);
     assertEquals(3, spooledThread.spooledDirectoryTransfer.getSent());
     assertEquals(0, spooledThread.spooledDirectoryTransfer.getError());
   }
diff --git a/doc/waarp-r66/source/changes.rst b/doc/waarp-r66/source/changes.rst
index 264a8f873a..68104eefdc 100644
--- a/doc/waarp-r66/source/changes.rst
+++ b/doc/waarp-r66/source/changes.rst
@@ -7,7 +7,7 @@ La procédure de mise à jour est disponible ici: :any:`upgrade`
 Non publié
 ==========
 
-Waarp R66 3.6.1 (2021-09-20)
+Waarp R66 3.6.1 (2021-12-10)
 ============================
 
 
@@ -41,6 +41,8 @@ Correctifs
   (issue [`#103 <https://github.com/waarp/Waarp-All/issues/103>`__])
 - Amélioration de la documentation et de sa génération
   [`#98 <https://github.com/waarp/Waarp-All/issues/98>`__]
+- Corrections de tests non passant sur des environnements chargés par ailleurs
+  (issue [`#104 <https://github.com/waarp/Waarp-All/issues/104>`__])
 - Mise à jour des dépendances
 
 
diff --git a/doc/waarp-r66/source/interface/rest/general.rst b/doc/waarp-r66/source/interface/rest/general.rst
index 38dd4f9a98..3c50d50912 100644
--- a/doc/waarp-r66/source/interface/rest/general.rst
+++ b/doc/waarp-r66/source/interface/rest/general.rst
@@ -48,7 +48,7 @@ requêtée selon l'algorithme suivant :
    sont utilisés, sont convertis en minuscules et triés dans l'ordre alphabétique
    des identifiants pour reconstruire une nouvelle chaine de requête.
 2. Le paramètre ``X-Auth-InternalKey`` est ajouté à la chaîne de requête
-   obtenue à l'étape precedente, avec pour valeur le mot de passe de
+   obtenue à l'étape précédente, avec pour valeur le mot de passe de
    l'utilisateur.
 3. La chaîne de caractère utilisée pour le calcul de la signature est construite
    en concaténant le chemin de l'url et la chaîne de requête obtenue
diff --git a/pom.xml b/pom.xml
index 394c2e5fd1..39e660778a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -269,8 +269,8 @@
     <waarp.module.version>test</waarp.module.version>
 
     <!-- Dependencies versions Common to JRE 6 to 11 -->
-    <netty.version>4.1.68.Final</netty.version>
-    <netty-tcnative.version>2.0.43.Final</netty-tcnative.version>
+    <netty.version>4.1.69.Final</netty.version>
+    <netty-tcnative.version>2.0.44.Final</netty-tcnative.version>
     <waarp-shaded.version>1.0.3</waarp-shaded.version><!-- Netty HTTP and
 		Selenuum -->
     <netty.http.version>1.5.0</netty.http.version><!--Java6 shaded version -->
@@ -289,16 +289,16 @@
     <xerces.version>2.12.1</xerces.version>
     <javasysmon.version>0.3.6</javasysmon.version>
     <gson.version>2.8.8</gson.version>
-    <jetty.version>9.4.43.v20210629</jetty.version>
+    <jetty.version>9.4.44.v20210927</jetty.version>
     <libthrift.version>0.9.3-1</libthrift.version><!--Java6 version:
 				cannot upgrade -->
     <httpclient.version>4.5.13</httpclient.version>
     <httpcore.version>4.4.14</httpcore.version>
     <ftp4j.version>1.7.2</ftp4j.version>
-    <joda-time.version>2.10.11</joda-time.version>
+    <joda-time.version>2.10.12</joda-time.version>
     <ztsd-jni.version>1.5.0-4</ztsd-jni.version>
     <javax.activation.version>1.2.0</javax.activation.version>
-    <bytebuddy.version>1.11.18</bytebuddy.version>
+    <bytebuddy.version>1.11.20</bytebuddy.version>
     <jna.version>5.9.0</jna.version>
     <jnr-posix-version>3.1.10</jnr-posix-version>
     <junit.version>4.13.2</junit.version>
@@ -310,7 +310,7 @@
     <htmlunit.version>2.53.0</htmlunit.version>
     <rest-assured.version>4.4.0</rest-assured.version>
     <mockito.version>3.12.4</mockito.version>
-    <guava-test.version>30.1.1-jre</guava-test.version>
+    <guava-test.version>31.0.1-jre</guava-test.version>
     <lz4-java.version>1.8.0</lz4-java.version>
 
     <!-- Maven plugins -->
@@ -355,11 +355,12 @@
     <coberturaMavenPluginVersion>2.7</coberturaMavenPluginVersion>
     <flatten-maven.version>1.2.7</flatten-maven.version>
     <spotbugs-maven-plugin-version>4.2.3</spotbugs-maven-plugin-version>
-    <spotbugs.version>4.4.1</spotbugs.version>
+    <spotbugs.version>4.4.2</spotbugs.version>
     <maven-install-version>2.5.2</maven-install-version>
     <jdeb.vafer.version>1.9</jdeb.vafer.version>
     <maven.rpm-maven-plugin.version>2.2.0</maven.rpm-maven-plugin.version>
     <exec.maven.version>3.0.0</exec.maven.version>
+    <extra-enforcer-rules.version>1.3</extra-enforcer-rules.version>
   </properties>
 
 
@@ -1200,7 +1201,7 @@
               <dependency>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>extra-enforcer-rules</artifactId>
-                <version>1.3</version>
+                <version>${extra-enforcer-rules.version}</version>
               </dependency>
               <dependency>
                 <groupId>org.codehaus.mojo</groupId>
@@ -1288,7 +1289,7 @@
         <revision>${waarp.version}-jre8</revision>
         <packaging.module>WaarpPackaging</packaging.module>
 
-        <guava.version>30.1.1-jre</guava.version>
+        <guava.version>31.0.1-jre</guava.version>
         <commons.daemon.version>1.2.4</commons.daemon.version>
         <commons.compress.version>1.21</commons.compress.version>
         <commons.io.version>2.11.0</commons.io.version>
@@ -1301,8 +1302,8 @@
         <mariadb.version>2.5.4</mariadb.version>
         <mysql.version>8.0.20</mysql.version>
         <postgresql.version>42.2.24</postgresql.version>
-        <jackson.version>2.12.5</jackson.version>
-        <jackson-databind.version>2.12.5</jackson-databind.version>
+        <jackson.version>2.13.0</jackson.version>
+        <jackson-databind.version>2.13.0</jackson-databind.version>
         <dom4j.version>2.1.3</dom4j.version>
         <resteasy.client.version>4.7.1.Final</resteasy.client.version>
         <javax.ws.rs.version>2.1.1</javax.ws.rs.version>
@@ -1314,10 +1315,10 @@
         <jaxb-impl.version>2.3.5</jaxb-impl.version>
         <jaxb-core.version>2.3.0.1</jaxb-core.version>
         <saxon.version>10.6</saxon.version>
-        <jersey-common.version>2.34</jersey-common.version>
+        <jersey-common.version>2.35</jersey-common.version>
         <log4j2.version>2.14.1</log4j2.version>
-        <minio.version>8.3.0</minio.version>
-        <okhttp.version>4.9.1</okhttp.version>
+        <minio.version>8.3.1</minio.version>
+        <okhttp.version>4.9.2</okhttp.version>
         <okio.version>2.10.0</okio.version>
         <kotlin.version>1.5.31</kotlin.version>
         <elastic-rest.version>7.15.0</elastic-rest.version>
@@ -1355,7 +1356,7 @@
               <dependency>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>extra-enforcer-rules</artifactId>
-                <version>1.3</version>
+                <version>${extra-enforcer-rules.version}</version>
               </dependency>
               <dependency>
                 <groupId>org.codehaus.mojo</groupId>
@@ -1480,7 +1481,7 @@
         <revision>${waarp.version}-jre11</revision>
         <packaging.module>WaarpPackaging</packaging.module>
 
-        <guava.version>30.1.1-jre</guava.version>
+        <guava.version>31.0.1-jre</guava.version>
         <commons.daemon.version>1.2.4</commons.daemon.version>
         <commons.compress.version>1.21</commons.compress.version>
         <commons.io.version>2.11.0</commons.io.version>
@@ -1492,8 +1493,8 @@
         <h2.version>1.4.200</h2.version>
         <mariadb.version>2.5.4</mariadb.version>
         <mysql.version>8.0.20</mysql.version>
-        <jackson.version>2.12.5</jackson.version>
-        <jackson-databind.version>2.12.5</jackson-databind.version>
+        <jackson.version>2.13.0</jackson.version>
+        <jackson-databind.version>2.13.0</jackson-databind.version>
         <postgresql.version>42.2.24</postgresql.version>
         <dom4j.version>2.1.3</dom4j.version>
         <resteasy.client.version>4.7.2.Final</resteasy.client.version>
@@ -1506,10 +1507,10 @@
         <jaxb-impl.version>2.3.5</jaxb-impl.version>
         <jaxb-core.version>2.3.0.1</jaxb-core.version>
         <saxon.version>10.6</saxon.version>
-        <jersey-common.version>2.34</jersey-common.version>
+        <jersey-common.version>2.35</jersey-common.version>
         <log4j2.version>2.14.1</log4j2.version>
-        <minio.version>8.3.0</minio.version>
-        <okhttp.version>4.9.1</okhttp.version>
+        <minio.version>8.3.1</minio.version>
+        <okhttp.version>4.9.2</okhttp.version>
         <okio.version>2.10.0</okio.version>
         <kotlin.version>1.5.31</kotlin.version>
         <elastic-rest.version>7.15.0</elastic-rest.version>
@@ -1532,7 +1533,7 @@
               <dependency>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>extra-enforcer-rules</artifactId>
-                <version>1.3</version>
+                <version>${extra-enforcer-rules.version}</version>
               </dependency>
               <dependency>
                 <groupId>org.codehaus.mojo</groupId>