[Box Backup-commit] COMMIT r2827 - box/RELEASE/0.11.1/test/bbackupd

[subversion at boxbackup.org]

Author: chris
Date: 2011-01-08 21:26:45 +0000 (Sat, 08 Jan 2011)
New Revision: 2827

Modified:
   box/RELEASE/0.11.1/test/bbackupd/testbbackupd.cpp
Log:
Fix compile failure caused by [2745].


Modified: box/RELEASE/0.11.1/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/RELEASE/0.11.1/test/bbackupd/testbbackupd.cpp	2011-01-08 21:16:12 UTC (rev 2826)
+++ box/RELEASE/0.11.1/test/bbackupd/testbbackupd.cpp	2011-01-08 21:26:45 UTC (rev 2827)
@@ -521,7 +521,10 @@
 			std::auto_ptr<BackupProtocolClientLoginConfirmed> loginConf(protocol.QueryLogin(0x01234567, BackupProtocolClientLogin::Flags_ReadOnly));
 			
 			// 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
 			protocol.QueryFinished();
@@ -3406,7 +3409,7 @@
 
 			// Test the restoration
 			TEST_THAT(BackupClientRestore(*client, restoredirid, 
-				"testfiles/restore-Test1", 
+				"Test1", "testfiles/restore-Test1", 
 				true /* print progress dots */) 
 				== Restore_Complete);
 
@@ -3415,7 +3418,7 @@
 
 			// 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);
 			
@@ -3426,7 +3429,7 @@
 			// Just check it doesn't bomb out -- will check this 
 			// 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 */) 
 				== Restore_Complete);
@@ -3439,7 +3442,7 @@
 			{
 				Logging::Guard guard(Log::FATAL);
 				TEST_THAT(BackupClientRestore(*client,
-					restoredirid, 
+					restoredirid, "Test1",
 					"testfiles/no-such-path/subdir", 
 					true /* print progress dots */) 
 					== Restore_TargetPathNotFound);
@@ -3787,13 +3790,13 @@
 			// Check that the restore fn returns resume possible,
 			// rather than doing anything
 			TEST_THAT(BackupClientRestore(*client, restoredirid, 
-				"testfiles/restore-interrupt", 
+				"Test1", "testfiles/restore-interrupt", 
 				true /* print progress dots */) 
 				== Restore_ResumePossible);
 
 			// Then resume it
 			TEST_THAT(BackupClientRestore(*client, restoredirid, 
-				"testfiles/restore-interrupt", 
+				"Test1", "testfiles/restore-interrupt", 
 				true /* print progress dots */, 
 				false /* deleted files */, 
 				false /* undelete server */, 
@@ -3828,7 +3831,7 @@
 
 			// 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 */, 
 				true /* undelete on server */)