Kill some upstream tests which are problematic.

Restore test-shutdown.sh (it was renamed to test-delay-shutdown.sh)

nbdkit.spec

@@ -38,7 +38,7 @@ ExclusiveArch:  x86_64
 
 Name:           nbdkit
 Version:        1.19.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -646,16 +646,16 @@ mkdir -p $HOME/.cache/libvirt
 # rethink this test upstream.
 truncate -s 0 tests/test-captive.sh
 
-# Temporarily kill tests/test-shutdown.sh because this test is racy on
-# slow hardware.
-truncate -s 0 tests/test-shutdown.sh
-
 %ifarch s390x
 # Temporarily kill tests/test-cache-max-size.sh since it fails
 # sometimes on s390x for unclear reasons.
 truncate -s 0 tests/test-cache-max-size.sh
 %endif
 
+# Temporarily kill test-nbd-tls.sh and test-nbd-tls-psk.sh
+# https://www.redhat.com/archives/libguestfs/2020-March/msg00191.html
+truncate -s 0 tests/test-nbd-tls.sh tests/test-nbd-tls-psk.sh
+
 # Make sure we can see the debug messages (RHBZ#1230160).
 export LIBGUESTFS_DEBUG=1
 export LIBGUESTFS_TRACE=1
@@ -964,6 +964,10 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Thu Mar 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.3-2
+- Kill some upstream tests which are problematic.
+- Restore test-shutdown.sh (it was renamed to test-delay-shutdown.sh)
+
 * Tue Mar 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.3-1
 - New upstream version 1.19.3.
 - New plugin and subpackage: tmpdisk.