[Box Backup-commit] COMMIT r3613 - box/trunk/test/bbackupd

subversion at boxbackup.org subversion at boxbackup.org
Thu Aug 6 20:15:15 BST 2015


Author: chris
Date: 2015-08-06 19:15:15 +0000 (Thu, 06 Aug 2015)
New Revision: 3613

Modified:
   box/trunk/test/bbackupd/testbbackupd.cpp
Log:
Stop daemon on test setup, in case the previous test didn't.

Modified: box/trunk/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/trunk/test/bbackupd/testbbackupd.cpp	2015-08-06 19:14:47 UTC (rev 3612)
+++ box/trunk/test/bbackupd/testbbackupd.cpp	2015-08-06 19:15:15 UTC (rev 3613)
@@ -459,6 +459,8 @@
 //! 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));
 




More information about the Boxbackup-commit mailing list