summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2007-11-04 04:16:26 +0000
committerChris Wilson <chris+github@qwirx.com>2007-11-04 04:16:26 +0000
commitbf495e4502d640326728262f64e6f0249a0527d2 (patch)
treeaa7dfc24634a2163b5cc8ca2d48c2b85d6ae960b
parent66f18c19e4422829b7d1c8203fbc26d7853c94b3 (diff)
Include the time taken by bbackupquery compare in the time between
syncs, used to check that the SyncAllowScript pauses backup for the correct length of time.
-rw-r--r--test/bbackupd/testbbackupd.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp
index f2b7b71a..0e0e949c 100644
--- a/test/bbackupd/testbbackupd.cpp
+++ b/test/bbackupd/testbbackupd.cpp
@@ -1622,6 +1622,10 @@ int test_bbackupd()
TEST_THAT(stat("testfiles" DIRECTORY_SEPARATOR
"syncallowscript.notifyran.2", &st) == 0);
+ // bbackupquery compare might take a while
+ // on slow machines, so start the timer now
+ long start_time = time(NULL);
+
// check that no backup has run (compare fails)
compareReturnValue = ::system(BBACKUPQUERY " -q "
"-c testfiles/bbackupd.conf "
@@ -1630,7 +1634,6 @@ int test_bbackupd()
TEST_RETURN(compareReturnValue, 2);
TestRemoteProcessMemLeaks("bbackupquery.memleaks");
- long start_time = time(NULL);
TEST_THAT(unlink(sync_control_file) == 0);
wait_for_sync_start();
long end_time = time(NULL);