Changeset 2828 for box/trunk/test

Timestamp:

08/01/2011 21:33:19 (17 months ago)

Author:

chris

Message:

Log the path, name and size of files being restored at TRACE level for
users wanting more detailed restore output.

Disable printing dots when logging at TRACE level is enabled.

Warn rather than failing to restore when the file attributes could not
be restored. (merges [2745], [2827]).

File:

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

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -522 +522 @@
                         
                         // Test the restoration
-                        TEST_THAT(BackupClientRestore(protocol, restoredirid, "testfiles/restore-interrupt", true /* print progress dots */) == Restore_Complete);
+                        TEST_THAT(BackupClientRestore(protocol, restoredirid,
+                                "Test1", "testfiles/restore-interrupt",
+                                true /* print progress dots */)
+                                == Restore_Complete);
 
                         // Log out
@@ -3432 +3435 @@
                         // Test the restoration
                         TEST_THAT(BackupClientRestore(*client, restoredirid, 
-                                "testfiles/restore-Test1", 
+                                "Test1", "testfiles/restore-Test1", 
                                 true /* print progress dots */) 
                                 == Restore_Complete);
@@ -3441 +3444 @@
                         // Make sure you can't restore a restored directory
                         TEST_THAT(BackupClientRestore(*client, restoredirid, 
-                                "testfiles/restore-Test1", 
+                                "Test1", "testfiles/restore-Test1", 
                                 true /* print progress dots */) 
                                 == Restore_TargetExists);
@@ -3452 +3455 @@
                         // properly later (when bbackupd is stopped)
                         TEST_THAT(BackupClientRestore(*client, deldirid, 
-                                "testfiles/restore-Test1-x1", 
+                                "Test1", "testfiles/restore-Test1-x1", 
                                 true /* print progress dots */, 
                                 true /* deleted files */) 
@@ -3465 +3468 @@
                                 Logging::Guard guard(Log::FATAL);
                                 TEST_THAT(BackupClientRestore(*client,
-                                        restoredirid, 
+                                        restoredirid, "Test1",
                                         "testfiles/no-such-path/subdir", 
                                         true /* print progress dots */) 
@@ -3813 +3816 @@
                         // rather than doing anything
                         TEST_THAT(BackupClientRestore(*client, restoredirid, 
-                                "testfiles/restore-interrupt", 
+                                "Test1", "testfiles/restore-interrupt", 
                                 true /* print progress dots */) 
                                 == Restore_ResumePossible);
@@ -3819 +3822 @@
                         // Then resume it
                         TEST_THAT(BackupClientRestore(*client, restoredirid, 
-                                "testfiles/restore-interrupt", 
+                                "Test1", "testfiles/restore-interrupt", 
                                 true /* print progress dots */, 
                                 false /* deleted files */, 
@@ -3854 +3857 @@
                         // Do restore and undelete
                         TEST_THAT(BackupClientRestore(*client, deldirid, 
-                                "testfiles/restore-Test1-x1-2", 
+                                "Test1", "testfiles/restore-Test1-x1-2", 
                                 true /* print progress dots */, 
                                 true /* deleted files */,