test1238: avoid tftpd being busy for tests shortly following

The tftpd server may still be busy if the total timeout of
25 seconds has not been reached or no sread error was received
during or after the execution of the timeout test 1238.

Once the next TFTP test comes around (eg. 1242 or 1243),
those will fail because the tftpd server is still waiting
on data from curl due to the UDP protocol being stateless
and having no connection close. On Linux this error may not
happen, because ICMP errors generated due to a swrite error
can also be returned async on the next sread call instead.

Therefore we will now just kill the tftpd server after test
1238 to make sure that the following tests are not affected.

This enables us to no longer ignore tests 1242, 1243, 2002
and 2003 on the CI platforms CirrusCI and AppVeyor.

Assisted-by: Peter Wu
Closes #5364

diff --git a/.cirrus.yml b/.cirrus.yml
index 9717d349cadda6d34041d5f31d5f41f1955fac1a..65f381725f2a2ef86d122b7e6381c9f4ba6c7b68 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -69,9 +69,9 @@ task:
     - SKIP_TESTS=''
     - uname -r
     - case `uname -r` in
-        13.0*) SKIP_TESTS='~1242 ~1243 ~2002 ~2003 !SFTP !SCP';;
-        12.1*) SKIP_TESTS='~1242 ~1243 ~2002 ~2003 !SFTP !SCP';;
-        11.3*) SKIP_TESTS='~1242 ~1243 ~2002 ~2003 !SFTP !SCP';;
+        13.0*) SKIP_TESTS='!SFTP !SCP';;
+        12.1*) SKIP_TESTS='!SFTP !SCP';;
+        11.3*) SKIP_TESTS='!SFTP !SCP';;
       esac
     - sudo -u nobody make V=1 TFLAGS="-n -a -p !flaky ${SKIP_TESTS}" test-nonflaky
   install_script:

diff --git a/appveyor.yml b/appveyor.yml
index cd0c24fa99ad6cd7632337e88a2dcf059c8b22b3..5bc485a79ac470e8cf8d1da659689bf42f64212e 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -220,12 +220,12 @@ environment:
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
         BUILD_SYSTEM: autotools
         TESTING: ON
-        DISABLED_TESTS: "!19 ~1056 !1233 ~1242 ~1243 ~2002 ~2003"
+        DISABLED_TESTS: "!19 ~1056 !1233"
         CONFIG_ARGS: "--enable-debug --enable-werror --enable-alt-svc --disable-threaded-resolver --disable-proxy"
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
         BUILD_SYSTEM: autotools
         TESTING: ON
-        DISABLED_TESTS: "!19 !504 !704 !705 ~1056 !1233 ~1242 ~1243 ~2002 ~2003"
+        DISABLED_TESTS: "!19 !504 !704 !705 ~1056 !1233"
         CONFIG_ARGS: "--enable-debug --enable-werror --enable-alt-svc --disable-threaded-resolver"
 
 install:

diff --git a/tests/data/test1238 b/tests/data/test1238
index a0eef417dcb4f86ac77ab9ed7dd07023796d7b60..1eacdf44ab08d46d4a9d5fc6ce946035bc8046ac 100644 (file)
--- a/tests/data/test1238
+++ b/tests/data/test1238
@@ -24,6 +24,14 @@ writedelay: 2
 <server>
 tftp
 </server>
+# Always kill the TFTP server to not affect following tests, due
+# to this test potentially keeping the TFTP server busy waiting
+# for another 5 seconds after this test has already terminated.
+# On some plattforms and CI not enough time passes between this
+# test and the next tests 1242 and 1243, causing them to fail.
+<killserver>
+tftp
+</killserver>
  <name>
 slow TFTP retrieve cancel due to -Y and -y
  </name>