Changeset 2452

Timestamp:

15/03/2009 22:45:45 (3 years ago)

Author:

chris

Message:

Fix race condition where bbackupd would run just before test finished
waiting for its 90 second error timeout on slow machines, e.g.
FreeBSD VM, causing bbackupd test to fail.

File:

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

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -2619 +2619 @@
                         "testfiles/0_2/backup/01234567/info.rf") == 0);
 
+                int store_fixed_time = time(NULL);
+
                 // Check that we DO get errors on compare (cannot do this
                 // until after we fix the store, which creates a race)
@@ -2633 +2635 @@
                         "notifyran.backup-start.wait-snapshot.1"));
 
-                // Set a tag for the notify script to distinguist from
+                // Set a tag for the notify script to distinguish from
                 // previous runs.
                 {
@@ -2643 +2645 @@
                 }
 
-                // bbackupd should pause for about 90 seconds
-                wait_for_backup_operation(85);
+                // bbackupd should pause for about 90 seconds from store_fixed_time,
+                // so check that it hasn't run after 85 seconds from store_fixed_time
+                wait_for_backup_operation(85 - time(NULL) + store_fixed_time);
                 TEST_THAT(!TestFileExists("testfiles/"
                         "notifyran.backup-start.wait-snapshot.1"));
@@ -2714 +2717 @@
                         "testfiles/0_2/backup/01234567/info.rf") == 0);
 
+                store_fixed_time = time(NULL);
+
                 // Check that we DO get errors on compare (cannot do this
                 // until after we fix the store, which creates a race)
@@ -2738 +2743 @@
                 }
 
-                // bbackupd should pause for at least 90 seconds
-                wait_for_backup_operation(85);
+                // bbackupd should pause for about 90 seconds from store_fixed_time,
+                // so check that it hasn't run after 85 seconds from store_fixed_time
+                wait_for_backup_operation(85 - time(NULL) + store_fixed_time);
                 TEST_THAT(!TestFileExists("testfiles/"
                         "notifyran.backup-start.wait-automatic.1"));