[commons-net] branch master updated: Tidy up

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git


The following commit(s) were added to refs/heads/master by this push:
     new 375b04f  Tidy up
375b04f is described below

commit 375b04f4b72dc9f6872ee248c09fe85b798fabfb
Author: Sebb <se...@apache.org>
AuthorDate: Mon Aug 2 00:37:25 2021 +0100

    Tidy up
---
 .github/workflows/maven.yml                                  | 2 +-
 src/test/java/org/apache/commons/net/ftp/FTPSClientTest.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index de6149b..dd2d69b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -22,7 +22,7 @@ jobs:
 
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    continue-on-error: true # ${{ matrix.experimental }}
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
         java: [ 8, 11, 16 ]
diff --git a/src/test/java/org/apache/commons/net/ftp/FTPSClientTest.java b/src/test/java/org/apache/commons/net/ftp/FTPSClientTest.java
index 196db42..48a7fa2 100644
--- a/src/test/java/org/apache/commons/net/ftp/FTPSClientTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/FTPSClientTest.java
@@ -192,7 +192,9 @@ public class FTPSClientTest {
         assertEquals(SocketPort, client.getRemotePort());
         //
         try {
-            Thread.sleep(200); // See if a short sleep before USER command helps
+            // HACK: Without this sleep, the user command sometimes does not reach the ftpserver
+            // This only seems to affect GitHub builds, and only Java 11+
+            Thread.sleep(200); // 100 seems to be not always enough
         } catch (InterruptedException e) {};
         assertTrue(client.login("test", "test"));
         assertClientCode(client);