[Box Backup-commit] COMMIT r1575 - box/chris/merge/test/bbackupd

boxbackup-dev at fluffy.co.uk boxbackup-dev at fluffy.co.uk
Sun Apr 22 21:46:51 BST 2007


Author: chris
Date: 2007-04-22 21:46:51 +0100 (Sun, 22 Apr 2007)
New Revision: 1575

Modified:
   box/chris/merge/test/bbackupd/testbbackupd.cpp
Log:
Use wait_for_sync_end() rather than calling bbackupquery ourselves (refs #3)


Modified: box/chris/merge/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/chris/merge/test/bbackupd/testbbackupd.cpp	2007-04-22 20:38:59 UTC (rev 1574)
+++ box/chris/merge/test/bbackupd/testbbackupd.cpp	2007-04-22 20:46:51 UTC (rev 1575)
@@ -1801,13 +1801,12 @@
 		TEST_RETURN(compareReturnValue, 1);
 		TestRemoteProcessMemLeaks("bbackupquery.memleaks");
 		
-		// Check that modifying files with old timestamps still get added
-		printf("Modify existing file, but change timestamp to rather old\n");
-		// Time critical, so sync
-		TEST_THAT(::system("../../bin/bbackupctl/bbackupctl -q -c testfiles/bbackupd.conf wait-for-sync") == 0);
-		TestRemoteProcessMemLeaks("bbackupctl.memleaks");
-		// Then wait a second, to make sure the scan is complete
-		::safe_sleep(1);
+		// Check that modifying files with old timestamps
+		// still get added
+		printf("\n==== Modify existing file, but change timestamp "
+			"to rather old\n");
+		wait_for_sync_end();
+
 		// Then modify an existing file
 		{
 			chmod("testfiles/TestDir1/sub23/rand.h", 0777);	// in the archive, it's read only




More information about the Boxbackup-commit mailing list