diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2020-05-10 18:40:24 +0200 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2020-05-11 19:59:19 +0200 |
| commit | cffbcc3110c1eda2e333f9cfe2e269154618793a (patch) | |
| tree | a6a73f54015c7ef37891b47257a9d0b606ce861c | |
| parent | 743e9c234b37299e48ba8cbfd650185d403a2c64 (diff) | |
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
| -rw-r--r-- | .cirrus.yml | 6 | ||||
| -rw-r--r-- | appveyor.yml | 4 | ||||
| -rw-r--r-- | tests/data/test1238 | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 9717d349c..65f381725 100644 --- 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 cd0c24fa9..5bc485a79 100644 --- 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 a0eef417d..1eacdf44a 100644 --- 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> |