Changeset 2827

Timestamp:

08/01/2011 21:26:45 (17 months ago)

Author:

chris

Message:

Fix compile failure caused by [2745].

File:

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

box/RELEASE/0.11.1/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
@@ -3407 +3410 @@
                         // Test the restoration
                         TEST_THAT(BackupClientRestore(*client, restoredirid, 
-                                "testfiles/restore-Test1", 
+                                "Test1", "testfiles/restore-Test1", 
                                 true /* print progress dots */) 
                                 == Restore_Complete);
@@ -3416 +3419 @@
                         // 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);
@@ -3427 +3430 @@
                         // 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 */) 
@@ -3440 +3443 @@
                                 Logging::Guard guard(Log::FATAL);
                                 TEST_THAT(BackupClientRestore(*client,
-                                        restoredirid, 
+                                        restoredirid, "Test1",
                                         "testfiles/no-such-path/subdir", 
                                         true /* print progress dots */) 
@@ -3788 +3791 @@
                         // rather than doing anything
                         TEST_THAT(BackupClientRestore(*client, restoredirid, 
-                                "testfiles/restore-interrupt", 
+                                "Test1", "testfiles/restore-interrupt", 
                                 true /* print progress dots */) 
                                 == Restore_ResumePossible);
@@ -3794 +3797 @@
                         // Then resume it
                         TEST_THAT(BackupClientRestore(*client, restoredirid, 
-                                "testfiles/restore-interrupt", 
+                                "Test1", "testfiles/restore-interrupt", 
                                 true /* print progress dots */, 
                                 false /* deleted files */, 
@@ -3829 +3832 @@
                         // 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 */,