summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2007-04-21 11:43:58 +0000
committerChris Wilson <chris+github@qwirx.com>2007-04-21 11:43:58 +0000
commit8e83d6c0b8eafcad71d006f257a9f54a7565c75a (patch)
tree22ef560ee94b0e29629e0303c244f43d25ebfa9d
parent262688916c54014e03331985ed41fd840dfc8851 (diff)
Enhance test for bbackupd pausing on change of client store marker
(refs #3)
-rw-r--r--test/bbackupd/testbbackupd.cpp23
1 files changed, 22 insertions, 1 deletions
diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp
index 742a11dd..fcc2ad47 100644
--- a/test/bbackupd/testbbackupd.cpp
+++ b/test/bbackupd/testbbackupd.cpp
@@ -1179,9 +1179,30 @@ int test_bbackupd()
"testfiles/0_1/backup/01234567/info.rf") == 0);
TEST_THAT(::rename("testfiles/0_2/backup/01234567/info.rf.bak",
"testfiles/0_2/backup/01234567/info.rf") == 0);
- // wait until bbackupd recovers from the exception
+
+ // Check that we DO get errors on compare
+ compareReturnValue = ::system(BBACKUPQUERY " -q "
+ "-c testfiles/bbackupd.conf "
+ "-l testfiles/query3b.log "
+ "\"compare -acQ\" quit");
+ TEST_RETURN(compareReturnValue, 2);
+ TestRemoteProcessMemLeaks("bbackupquery.memleaks");
+
+ // Wait until bbackupd recovers from the exception
wait_for_backup_operation(100);
+ // Ensure that the force-upload file gets uploaded,
+ // meaning that bbackupd recovered
+ sync_and_wait();
+
+ // Check that it did get uploaded, and we have no more errors
+ compareReturnValue = ::system(BBACKUPQUERY " -q "
+ "-c testfiles/bbackupd.conf "
+ "-l testfiles/query3b.log "
+ "\"compare -acQ\" quit");
+ TEST_RETURN(compareReturnValue, 1);
+ TestRemoteProcessMemLeaks("bbackupquery.memleaks");
+
// Bad case: delete a file/symlink, replace it with a directory
printf("Replace symlink with directory, add new directory\n");
#ifndef WIN32