Changeset 2216

Timestamp:

03/08/2008 08:09:18 (5 months ago)

Author:

chris

Message:

Windows compile and deletion/housekeeping test fix.

Files:

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

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -92 +92 @@
         std::string found_str = _oss2.str(); \
         \
-        TEST_THAT(exp_str == found_str); \
-        std::string _line = line; \
-        \
         if(exp_str != found_str) \
         { \
+                std::string _line = line; \
                 printf("Expected <%s> but found <%s> in <%s>\n", \
                         exp_str.c_str(), found_str.c_str(), _line.c_str()); \
+                TEST_FAIL_WITH_MESSAGE(#found " != " #expected " in " line); \
         } \
 }
@@ -1347 +1346 @@
                 }
 
+                if (failures > 0)
+                {
+                        // stop early to make debugging easier
+                        return 1;
+                }
+
+                // ensure time is different to refresh the cache
+                ::safe_sleep(1);
+
                 BOX_TRACE("Restart bbackupd with more exclusions");
                 // Start again with a new config that excludes d3 and f2,
@@ -1358 +1366 @@
                 bbackupd_pid = LaunchServer(cmd, "testfiles/bbackupd.pid");
                 TEST_THAT(bbackupd_pid != -1 && bbackupd_pid != 0);
-                ::safe_sleep(1);
                 TEST_THAT(ServerIsAlive(bbackupd_pid));
                 TEST_THAT(ServerIsAlive(bbstored_pid));
@@ -1364 +1371 @@
                 if (!ServerIsAlive(bbstored_pid)) return 1;
                 */
+
                 BackupDaemon bbackupd;
                 bbackupd.Configure("testfiles/bbackupd-exclude.conf");
@@ -1372 +1380 @@
                 // wait_for_sync_end();
                 {
-                        Logging::Guard guard(Log::ERROR);
+                        // Logging::Guard guard(Log::ERROR);
                         bbackupd.RunSyncNow();
                 }
@@ -1394 +1402 @@
                 // d7           deleted
                 // Careful with timing here, these files can already be
-                // deleted by housekeeping.
+                // deleted by housekeeping. 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.
+
+                #ifdef WIN32
+                        BOX_TRACE("Wait long enough that housekeeping "
+                                "will run again")
+                        wait_for_backup_operation(5);
+                        BOX_TRACE("done.");
+                #endif
 
                 BOX_TRACE("Find out whether bbackupd marked files as deleted");
@@ -1418 +1440 @@
                                 ReadDirectory(*client, spacetestDirId);
 
+                        // these files were deleted before, they should be
+                        // long gone by now
+
                         TEST_THAT(SearchDir(*spacetest_dir, "f1") == 0);
+                        TEST_THAT(SearchDir(*spacetest_dir, "d7") == 0);
+
+                        // these files have just been deleted, because
+                        // 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"));
-                        TEST_THAT(SearchDir(*spacetest_dir, "d7") == 0);
 
                         int64_t d3_id = SearchDir(*spacetest_dir, "d3");
@@ -1455 +1484 @@
                 BOX_TRACE("done.");
 
+                if (failures > 0)
+                {
+                        // stop early to make debugging easier
+                        return 1;
+                }
+
                 // Wait for housekeeping to run
                 BOX_TRACE("Wait for housekeeping to remove the deleted files");
@@ -1503 +1538 @@
                 }
 
+                if (failures > 0)
+                {
+                        // stop early to make debugging easier
+                        return 1;
+                }
+
                 // Need 22 blocks free to upload everything
                 TEST_THAT_ABORTONFAIL(::system(BBSTOREACCOUNTS " -c "
@@ -1547 +1588 @@
                         client->QueryFinished();
                         sSocket.Close();
+                }
+
+                if (failures > 0)
+                {
+                        // stop early to make debugging easier
+                        return 1;
                 }
 
@@ -1599 +1646 @@
                 if (!ServerIsAlive(bbackupd_pid)) return 1;
                 if (!ServerIsAlive(bbstored_pid)) return 1;
+
+                if (failures > 0)
+                {
+                        // stop early to make debugging easier
+                        return 1;
+                }
         }
 
@@ -1623 +1676 @@
 
                 char buf[PATH_MAX];
-                TEST_THAT(getcwd(buf, sizeof(buf)) != NULL);
+                TEST_THAT(getcwd(buf, sizeof(buf)) == buf);
                 std::string path = buf;
                 path += DIRECTORY_SEPARATOR SYM_DIR 
@@ -1889 +1942 @@
 
                 }
+
+                int compareReturnValue;
 
 #ifdef WIN32
@@ -1931 +1986 @@
 
                 char cwdbuf[1024];
-                TEST_EQUAL(cwdbuf, getcwd(cwdbuf, sizeof(cwdbuf)), "getcwd");
+                TEST_THAT(getcwd(cwdbuf, sizeof(cwdbuf)) == cwdbuf);
                 std::string cwd = cwdbuf;
 
@@ -2267 +2322 @@
 
                         // check that no backup has run (compare fails)
-                        int compareReturnValue = ::system(BBACKUPQUERY " "
+                        compareReturnValue = ::system(BBACKUPQUERY " "
                                 "-Werror "
                                 "-c testfiles/bbackupd.conf "
@@ -2340 +2395 @@
                 // wait for backup daemon to do it's stuff, and compare again
                 wait_for_backup_operation();
-                int compareReturnValue = ::system(BBACKUPQUERY " -Wwarning "
+                compareReturnValue = ::system(BBACKUPQUERY " -Wwarning "
                         "-c testfiles/bbackupd.conf "
                         "-l testfiles/query2.log "