diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-10-28 01:13:54 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-28 01:13:54 +0200 |
| commit | 7b4540ae3c9ac331eed17fdf15a33f64b103cb4d (patch) | |
| tree | ca47acead4e3676acd942de5f443d7bdc5fdd90c /test/bbackupd | |
| parent | 8a937bd354001a190dbe66538aacb353e7c99341 (diff) | |
Import upstream version 0.11.1~r2837
Diffstat (limited to 'test/bbackupd')
| -rw-r--r-- | test/bbackupd/testbbackupd.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index 32f3c176..77c463ba 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -521,7 +521,10 @@ void do_interrupted_restore(const TLSContext &context, int64_t restoredirid) 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 @@ int test_bbackupd() // 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 @@ int test_bbackupd() // 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 @@ int test_bbackupd() // 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 @@ int test_bbackupd() { 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 @@ int test_bbackupd() // 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 @@ int test_bbackupd() // 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 */) |