diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-02-27 23:35:05 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-02-27 23:35:05 +0000 |
| commit | 73f20fe6a2664d65aef1dd6f274ebc37760876f4 (patch) | |
| tree | bffb3ab663dc055cfdc2dccbec1f91a0dd1df570 /lib/backupstore/StoreTestUtils.cpp | |
| parent | f211f55a3118d1a7213d26f8b54a3f37edbc1774 (diff) | |
Use the new test utilities to remove some duplicate code.
Fix previous changes by waiting for forked bbstored process during termination.
Diffstat (limited to 'lib/backupstore/StoreTestUtils.cpp')
| -rw-r--r-- | lib/backupstore/StoreTestUtils.cpp | 4 |
1 files changed, 2 insertions, 2 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)); |