From a6a6ca0bb3bae5ba252f3593e418a496377798ed Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 22 Apr 2007 20:46:51 +0000 Subject: Use wait_for_sync_end() rather than calling bbackupquery ourselves (refs #3) --- test/bbackupd/testbbackupd.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'test/bbackupd') diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index 70c5e394..7d703492 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -1801,13 +1801,12 @@ int test_bbackupd() 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 -- cgit v1.2.3