summaryrefslogtreecommitdiff
path: root/test/bbackupd
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2015-08-06 19:15:15 +0000
committerChris Wilson <chris+github@qwirx.com>2015-08-06 19:15:15 +0000
commit1c836884de7164a9ad9f9da23d8429272b96a802 (patch)
treed56d7ecea2d12ee85d1de454980f1abcd22cf246 /test/bbackupd
parentf2ac0bc186728ec0aa8695729d9b488dee5ec679 (diff)
Stop daemon on test setup, in case the previous test didn't.
Diffstat (limited to 'test/bbackupd')
-rw-r--r--test/bbackupd/testbbackupd.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp
index 58995e33..6baa5d06 100644
--- a/test/bbackupd/testbbackupd.cpp
+++ b/test/bbackupd/testbbackupd.cpp
@@ -459,6 +459,8 @@ bool setup_test_bbackupd(BackupDaemon& bbackupd, bool do_unpack_files = true,
//! Simplifies calling setUp() with the current function name in each test.
#define SETUP_TEST_BBACKUPD() \
SETUP(); \
+ TEST_THAT(bbackupd_pid == 0 || StopClient()); \
+ TEST_THAT(bbstored_pid == 0 || StopServer()); \
TEST_THAT(kill_running_daemons()); \
TEST_THAT(create_account(10000, 20000));