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

subversion at boxbackup.org subversion at boxbackup.org
Fri Dec 26 23:16:56 GMT 2014


Author: chris
Date: 2014-12-26 23:16:56 +0000 (Fri, 26 Dec 2014)
New Revision: 3497

Modified:
   box/trunk/test/bbackupd/testbbackupd.cpp
Log:
Don't try to kill daemons at beginning of each deselected test.

This just results in huge console noise if we can't kill a daemon for some
reason. Kill them once, after all tests have run, instead.

Modified: box/trunk/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/trunk/test/bbackupd/testbbackupd.cpp	2014-12-26 23:16:52 UTC (rev 3496)
+++ box/trunk/test/bbackupd/testbbackupd.cpp	2014-12-26 23:16:56 UTC (rev 3497)
@@ -469,10 +469,10 @@
 
 //! Simplifies calling setUp() with the current function name in each test.
 #define SETUP() \
-	TEST_THAT(kill_running_daemons()); \
 	if (!setUp(__FUNCTION__)) return true; \
 	num_tests_selected++; \
-	int old_failure_count = failures;
+	int old_failure_count = failures; \
+	TEST_THAT(kill_running_daemons());
 
 #define SETUP_WITHOUT_FILES() \
 	SETUP() \
@@ -4214,6 +4214,7 @@
 
 	TEST_LINE(num_tests_selected > 0, "No tests matched the patterns "
 		"specified on the command line");
+	TEST_THAT(kill_running_daemons());
 
 	return (failures == 0 && num_tests_selected > 0);
 }




More information about the Boxbackup-commit mailing list