summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2007-04-22 21:17:36 +0000
committerChris Wilson <chris+github@qwirx.com>2007-04-22 21:17:36 +0000
commit335e891f9d3d365eb9b4534eeeb1f890aea078ed (patch)
tree92e49d14709be49ee72b3a46d4fcbb73314e5786 /test
parente89ceeb26d5ccb022ad55615266c57298a90e6f4 (diff)
Use wait_for_sync_end() to synchronise the test more accurately with
bbackupd, hopefully reducing random failures. (refs #3)
Diffstat (limited to 'test')
-rw-r--r--test/bbackupd/testbbackupd.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp
index d869d5d5..2c7536ea 100644
--- a/test/bbackupd/testbbackupd.cpp
+++ b/test/bbackupd/testbbackupd.cpp
@@ -1841,7 +1841,9 @@ int test_bbackupd()
TEST_THAT(::utimes("testfiles/TestDir1/sub23/rand.h", times) == 0);
}
// Wait and test
- wait_for_backup_operation();
+ wait_for_sync_end(); // files too new
+ wait_for_sync_end(); // should (not) be backed up this time
+
compareReturnValue = ::system(BBACKUPQUERY " -q "
"-c testfiles/bbackupd.conf "
"-l testfiles/query3l.log "
@@ -1858,7 +1860,8 @@ int test_bbackupd()
#endif
// Wait and test
- wait_for_backup_operation();
+ wait_for_sync_end();
+ wait_for_sync_end();
// compare with exclusions, should not find differences
compareReturnValue = ::system(BBACKUPQUERY " -q "