Changeset 2320 for box/trunk/test

Timestamp:

04/10/2008 16:14:20 (4 years ago)

Author:

chris

Message:

Fix bbackupd/housekeeping deletion test for Unix again, and hopefully
make it work on Windows too. Improve comments about this test.

File:

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

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -1408 +1408 @@
                 // d3/d4/f5     excluded
                 // d7           deleted
-                // Careful with timing here, these files can already be
-                // deleted by housekeeping. On Win32, housekeeping runs
-                // immediately after disconnect, but only if enough time
+                // Careful with timing here, these files will be removed by
+                // housekeeping the next time it runs. On Win32, housekeeping
+                // runs immediately after disconnect, but only if enough time
                 // has elapsed since the last housekeeping. Since the
                 // backup run closely follows the last one, housekeeping
-                // should not run afterwards. By waiting before
-                // connecting to check the results, we should force
-                // housekeeping to run after that check, so the next check
-                // will see that the deleted files have been removed.
-
-#ifndef WIN32
-                BOX_TRACE("Wait long enough that housekeeping "
-                        "will run again")
-                wait_for_backup_operation(5);
-                BOX_TRACE("done.");
+                // should not run afterwards. On other platforms, we want to
+                // get in immediately after the backup and hope that
+                // housekeeping doesn't beat us to it.
 
                 BOX_TRACE("Find out whether bbackupd marked files as deleted");
@@ -1455 +1448 @@
                         // they are excluded by the new configuration.
                         // but housekeeping should not have run yet
+
                         TEST_THAT(test_entry_deleted(*spacetest_dir, "f2"));
                         TEST_THAT(test_entry_deleted(*spacetest_dir, "d3"));
@@ -1495 +1489 @@
                         return 1;
                 }
-#endif
-
-                // Wait for housekeeping to run
+
                 BOX_TRACE("Wait for housekeeping to remove the deleted files");
                 wait_for_backup_operation(5);