Changeset 2316

Timestamp:

03/10/2008 23:45:11 (3 years ago)

Author:

chris

Message:

Fix directory record conflicts caused by including the same directory
twice.

Fix/reduce locked file timing conflict problems.

Location:

box/trunk/test/bbackupd

Files:

• testbbackupd.cpp (modified) (9 diffs)
• testfiles/bbackupd-temploc.conf (modified) (1 diff)

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -1418 +1418 @@
                 // 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
+#ifndef WIN32
+                BOX_TRACE("Wait long enough that housekeeping "
+                        "will run again")
+                wait_for_backup_operation(5);
+                BOX_TRACE("done.");
 
                 BOX_TRACE("Find out whether bbackupd marked files as deleted");
@@ -1496 +1495 @@
                         return 1;
                 }
+#endif
 
                 // Wait for housekeeping to run
@@ -1932 +1932 @@
 
         printf("\n==== Testing that redundant locations are deleted on time\n");
+
+        // unpack the files for the redundant location test
+        TEST_THAT(::system("rm -rf testfiles/TestDir2") == 0);
+        TEST_THAT(::mkdir("testfiles/TestDir2", 0777) == 0);
+
+        #ifdef WIN32
+                TEST_THAT(::system("tar xzvf testfiles/spacetest1.tgz "
+                        "-C testfiles/TestDir2") == 0);
+        #else
+                TEST_THAT(::system("gzip -d < testfiles/spacetest1.tgz "
+                        "| ( cd testfiles/TestDir2 && tar xf - )") == 0);
+        #endif
 
         // BLOCK
@@ -3823 +3835 @@
                 // and the appropriate error is reported.
                 // Wait for the sync to finish, so that we have time to work
-                wait_for_sync_start();
+                wait_for_sync_end();
                 // Now we have about three seconds to work
 
@@ -3836 +3848 @@
                         TEST_THAT(!TestFileExists("testfiles/"
                                 "notifyran.read-error.1"));
-
+                }
+
+                TEST_THAT(ServerIsAlive(bbackupd_pid));
+                TEST_THAT(ServerIsAlive(bbstored_pid));
+                if (!ServerIsAlive(bbackupd_pid)) return 1;
+                if (!ServerIsAlive(bbstored_pid)) return 1;
+
+                if (handle != 0)
+                {
                         // this sync should try to back up the file, 
                         // and fail, because it's locked
@@ -3844 +3864 @@
                         TEST_THAT(!TestFileExists("testfiles/"
                                 "notifyran.read-error.2"));
-
+                }
+
+                TEST_THAT(ServerIsAlive(bbackupd_pid));
+                TEST_THAT(ServerIsAlive(bbstored_pid));
+                if (!ServerIsAlive(bbackupd_pid)) return 1;
+                if (!ServerIsAlive(bbstored_pid)) return 1;
+
+                if (handle != 0)
+                {
                         // now close the file and check that it is
                         // backed up on the next run.
@@ -3853 +3881 @@
                         TEST_THAT(!TestFileExists("testfiles/"
                                 "notifyran.read-error.2"));
-
+                }
+
+                TEST_THAT(ServerIsAlive(bbackupd_pid));
+                TEST_THAT(ServerIsAlive(bbstored_pid));
+                if (!ServerIsAlive(bbackupd_pid)) return 1;
+                if (!ServerIsAlive(bbstored_pid)) return 1;
+
+                if (handle != 0)
+                {
                         // compare, and check that it works
                         // reports the correct error message (and finishes)
@@ -3863 +3899 @@
                                 BackupQueries::ReturnCode::Compare_Same);
                         TestRemoteProcessMemLeaks("bbackupquery.memleaks");
-
+                }
+
+                TEST_THAT(ServerIsAlive(bbackupd_pid));
+                TEST_THAT(ServerIsAlive(bbstored_pid));
+                if (!ServerIsAlive(bbackupd_pid)) return 1;
+                if (!ServerIsAlive(bbstored_pid)) return 1;
+
+                if (handle != 0)
+                {
                         // open the file again, compare and check that compare
                         // reports the correct error message (and finishes)
@@ -3881 +3925 @@
                         // works again
                         CloseHandle(handle);
-
+                }
+
+                TEST_THAT(ServerIsAlive(bbackupd_pid));
+                TEST_THAT(ServerIsAlive(bbstored_pid));
+                if (!ServerIsAlive(bbackupd_pid)) return 1;
+                if (!ServerIsAlive(bbstored_pid)) return 1;
+
+                if (handle != 0)
+                {
                         compareReturnValue = ::system(BBACKUPQUERY " "
                                 "-c testfiles/bbackupd.conf "

box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf

@@ -50 +50 @@
         Test2
         {
-                Path = testfiles/TestDir1
+                Path = testfiles/TestDir2
         }
 }