Changeset 2276 for box/trunk/test/bbackupd/testbbackupd.cpp

Timestamp:

12/09/2008 21:39:45 (4 years ago)

Author:

chris

Message:

Test for read errors being reported at more points during the tests.

Test that symlink to self does not cause restore to fail.

File:

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

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -1231 +1231 @@
 #endif // PLATFORM_CLIB_FNS_INTERCEPTION_IMPOSSIBLE
 
+        // Check that no read error has been reported yet
+        TEST_THAT(!TestFileExists("testfiles/notifyran.read-error.1"));
+
         std::string cmd = BBACKUPD " " + bbackupd_args + 
                 " testfiles/bbackupd.conf";
@@ -1659 +1662 @@
         }
 
+        // Check that no read error has been reported yet
+        TEST_THAT(!TestFileExists("testfiles/notifyran.read-error.1"));
+
         #ifndef WIN32 // requires fork
         printf("\n==== Testing that bbackupd responds correctly to "
@@ -1821 +1827 @@
                         DIRECTORY_SEPARATOR "link") == 0);
 
+                // also test symlink-to-self loop does not break restore
+                TEST_THAT(symlink("self", SYM_DIR "/self") == 0);
+
                 ::wait_for_operation(4);
                 ::sync_and_wait();
@@ -1919 +1928 @@
         }
         #endif // !WIN32
+
+        // Check that no read error has been reported yet
+        TEST_THAT(!TestFileExists("testfiles/notifyran.read-error.1"));
 
         printf("\n==== Testing that redundant locations are deleted on time\n");
@@ -2024 +2036 @@
         if(bbackupd_pid > 0)
         {
+                // Check that no read error has been reported yet
+                TEST_THAT(!TestFileExists("testfiles/notifyran.read-error.1"));
+
                 printf("\n==== Check that read-only directories and "
                         "their contents can be restored.\n");
@@ -2384 +2399 @@
 #endif // WIN32
 
+                // Check that no read error has been reported yet
+                TEST_THAT(!TestFileExists("testfiles/notifyran.read-error.1"));
+
                 TEST_THAT(ServerIsAlive(bbackupd_pid));
                 TEST_THAT(ServerIsAlive(bbstored_pid));
@@ -2495 +2513 @@
                         }
                 }
+
+                // Check that no read error has been reported yet
+                TEST_THAT(!TestFileExists("testfiles/notifyran.read-error.1"));
 
                 TEST_THAT(ServerIsAlive(bbackupd_pid));
@@ -3010 +3031 @@
                 TestRemoteProcessMemLeaks("bbackupquery.memleaks");
                 
+                // Check that no read error has been reported yet
+                TEST_THAT(!TestFileExists("testfiles/notifyran.read-error.1"));
+
                 TEST_THAT(ServerIsAlive(bbackupd_pid));
                 TEST_THAT(ServerIsAlive(bbstored_pid));
@@ -3050 +3074 @@
                 if (!ServerIsAlive(bbstored_pid)) return 1;
 
+                // Check that no read error has been reported yet
+                TEST_THAT(!TestFileExists("testfiles/notifyran.read-error.1"));
+
                 // Check that modifying files with old timestamps
                 // still get added
@@ -3108 +3135 @@
                 if (!ServerIsAlive(bbackupd_pid)) return 1;
                 if (!ServerIsAlive(bbstored_pid)) return 1;
+
+                // Check that no read error has been reported yet
+                TEST_THAT(!TestFileExists("testfiles/notifyran.read-error.1"));
 
                 // Add some files and directories which are marked as excluded
@@ -3195 +3225 @@
                 if(::getuid() != 0)
                 {
+                        // Check that the error has not been reported yet
+                        TEST_THAT(!TestFileExists("testfiles/notifyran.read-error.1"));
+
                         // Check that read errors are reported neatly
                         printf("\n==== Add unreadable files\n");
@@ -3817 +3850 @@
                         CloseHandle(handle);
                         wait_for_sync_end();
+
+                        // still no read errors?
                         TEST_THAT(!TestFileExists("testfiles/"
                                 "notifyran.read-error.2"));