Changeset 2499

Timestamp:

10/04/2009 00:06:42 (3 years ago)

Author:

chris

Message:

Fix race conditions where backups happen too slowly and tests fail.

File:

• box/trunk/test/bbackupd/testbbackupd.cpp (modified) (4 diffs)

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -1756 +1756 @@
                 }
 
-                test_run_bbstored();
+                TEST_THAT(test_run_bbstored() == 0);
 
                 cmd = BBACKUPD " " + bbackupd_args +
@@ -2542 +2542 @@
                 }
 
-                // wait for backup daemon to do it's stuff, and compare again
-                wait_for_backup_operation("bbackupd to sync the changes");
-
+                // wait long enough for new files to be old enough to backup
+                wait_for_operation(5, "new files to be old enough");
+
+                // wait for backup daemon to do it's stuff
+                sync_and_wait();
+
+                // compare to make sure that it worked
                 compareReturnValue = ::system(BBACKUPQUERY " -Wwarning "
                         "-c testfiles/bbackupd.conf "
@@ -2995 +2999 @@
                 TEST_THAT(TestFileExists("testfiles/TestDir1/tracked-2"));
 
+                // wait for them to be old enough to back up
+                wait_for_operation(5, "tracked files to be old enough");
+                
                 // back up both files
-                wait_for_operation(5, "tracked files to be old enough");
-                wait_for_backup_operation("bbackupd to sync the tracked files");
-
+                sync_and_wait();
+
+                // compare to make sure that it worked
                 compareReturnValue = ::system(BBACKUPQUERY " "
                         "-c testfiles/bbackupd.conf "
@@ -4040 +4047 @@
 
         r = test_run_bbstored();
+        TEST_THAT(r == 0);
         if(r != 0) return r;