Use the new test utilities to remove some duplicate code.

Fix previous changes by waiting for forked bbstored process during termination.

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/backupstore/StoreTestUtils.cpp b/lib/backupstore/StoreTestUtils.cpp
index 69af043b..99ebb9df 100644
--- a/lib/backupstore/StoreTestUtils.cpp
+++ b/lib/backupstore/StoreTestUtils.cpp
@@ -313,11 +313,11 @@ bool StartServer()
 	return true;
 }
 
-bool StopServer()
+bool StopServer(bool wait_for_process)
 {
 	TEST_THAT_THROWONFAIL(bbstored_pid != 0);
 	TEST_THAT_THROWONFAIL(ServerIsAlive(bbstored_pid));
-	TEST_THAT_THROWONFAIL(KillServer(bbstored_pid));
+	TEST_THAT_THROWONFAIL(KillServer(bbstored_pid, wait_for_process));
 	::sleep(1);
 
 	TEST_THAT_THROWONFAIL(!ServerIsAlive(bbstored_pid));
diff --git a/lib/backupstore/StoreTestUtils.h b/lib/backupstore/StoreTestUtils.h
index ad4ff14c..d15404fa 100644
--- a/lib/backupstore/StoreTestUtils.h
+++ b/lib/backupstore/StoreTestUtils.h
@@ -67,7 +67,7 @@ bool check_reference_counts();
 bool StartServer();
 
 //! Stops the currently running bbstored test server.
-bool StopServer();
+bool StopServer(bool wait_for_process = false);
 
 //! Creates the standard test account, for example after delete_account().
 bool create_account(int soft, int hard);