This is testing the delay filter, and we want to use the name ‘test-shutdown’ in a later commit to test the new nbdkit_shutdown() API, so let’s rename it. --- tests/Makefile.am | 4 ++-- tests/{test-shutdown.sh => test-delay-shutdown.sh} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index effe1857..2dc35309 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -101,6 +101,7 @@ EXTRA_DIST = \ test-data-file.sh \ test-data-raw.sh \ test-debug-flags.sh \ + test-delay-shutdown.sh \ test-dump-config.sh \ test-dump-plugin.sh \ test-dump-plugin-example4.sh \ @@ -181,7 +182,6 @@ EXTRA_DIST = \ test-retry-readonly.sh \ test-retry-reopen-fail.sh \ test-retry-zero-flags.sh \ - test-shutdown.sh \ test-ssh.sh \ test-swap.sh \ test.tcl \ @@ -1017,7 +1017,7 @@ endif TESTS += test-cow-null.sh # delay filter tests. -TESTS += test-shutdown.sh +TESTS += test-delay-shutdown.sh LIBNBD_TESTS += test-delay test_delay_SOURCES = test-delay.c diff --git a/tests/test-shutdown.sh b/tests/test-delay-shutdown.sh similarity index 96% rename from tests/test-shutdown.sh rename to tests/test-delay-shutdown.sh index 7d17045a..342c2346 100755 --- a/tests/test-shutdown.sh +++ b/tests/test-delay-shutdown.sh @@ -37,7 +37,7 @@ requires qemu-io --version requires timeout --version sock=`mktemp -u` -files="shutdown.pid $sock" +files="delay-shutdown.pid $sock" cleanup_fn rm -f $files fail=0 @@ -45,7 +45,7 @@ fail=0 # This tests that the delay filter's use of nbdkit_nanosleep is able to # react to both connection death and server shutdown without finishing # the entire delay duration. -start_nbdkit -P shutdown.pid -U $sock --filter=noparallel --filter=delay \ +start_nbdkit -P delay-shutdown.pid -U $sock --filter=noparallel --filter=delay \ null 1M serialize=connections rdelay=60 # Early client death should not stall connection of second client. -- 2.25.0