tests: Replace kill_quiet after shutdown with wait_process_gone

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

tests/_test_tpm2_encrypted_state

@@ -246,10 +246,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile

tests/_test_tpm2_getcap

@@ -79,10 +79,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_hashing

@@ -167,10 +167,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_init

@@ -96,10 +96,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_locality

@@ -144,10 +144,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_save_load_encrypted_state

@@ -249,10 +249,8 @@ if [ $? -ne 0 ]; then
 	cat $logfile
 	exit 1
 fi
-sleep 0.5
 
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile
@@ -320,8 +318,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile
@@ -368,8 +365,7 @@ if [ $? -eq 0 ]; then
 	exit 1
 fi
 
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -ne 0 ]; then
+if ! wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM not running anymore after failed INIT."
 	echo "TPM Logfile:"
 	cat $logfile
@@ -398,8 +394,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile

tests/_test_tpm2_save_load_state

@@ -256,10 +256,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile

tests/_test_tpm2_save_load_state_da_timeout

@@ -310,10 +310,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	echo "TPM Logfile:"
 	cat $logfile

tests/_test_tpm2_savestate

@@ -140,10 +140,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_setbuffersize

@@ -114,10 +114,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_swtpm_bios

@@ -60,10 +60,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -ne 0 ]; then
+if ! wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM not running anymore after INIT."
 	exit 1
 fi
@@ -151,10 +148,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_volatilestate

@@ -220,10 +220,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/_test_tpm2_wrongorder

@@ -105,10 +105,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-sleep 0.5
-
-kill_quiet -0 ${SWTPM_PID} 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${SWTPM_PID} 1; then
 	echo "Error: ${SWTPM_INTERFACE} TPM should not be running anymore."
 	exit 1
 fi

tests/test_tpm2_vtpm_proxy

@@ -109,9 +109,7 @@ if [ "$res" != "$exp" ]; then
 	exit 1
 fi
 
-sleep 0.2
-kill_quiet -0 $PID 2>/dev/null
-if [ $? -eq 0 ]; then
+if wait_process_gone ${PID} 1; then
 	echo "Error: TPM should not be running anymore."
 	exit 1
 fi