summaryrefslogtreecommitdiff
path: root/test/bbackupd/testbbackupd.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'test/bbackupd/testbbackupd.cpp')
-rw-r--r--test/bbackupd/testbbackupd.cpp56
1 files changed, 32 insertions, 24 deletions
diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp
index deff53e2..b2264b14 100644
--- a/test/bbackupd/testbbackupd.cpp
+++ b/test/bbackupd/testbbackupd.cpp
@@ -1272,6 +1272,13 @@ bool test_getobject_on_nonexistent_file()
TEARDOWN_TEST_BBACKUPD();
}
+void run_bbackupd_sync_with_logging(BackupDaemon& bbackupd)
+{
+ Logging::Tagger bbackupd_tagger("bbackupd", true); // replace
+ Logging::ShowTagOnConsole temp_enable_tags;
+ bbackupd.RunSyncNow();
+}
+
// ASSERT((mpBlockIndex == 0) || (NumBlocksInIndex != 0)) in
// BackupStoreFileEncodeStream::Recipe::Recipe once failed, apparently because
// a zero byte file had a block index but no entries in it. But this test
@@ -1556,30 +1563,31 @@ bool test_backup_hardlinked_files()
{
SETUP_WITH_BBSTORED();
+ run_bbackupd_sync_with_logging(bbackupd);
bbackupd.RunSyncNow();
TEST_COMPARE(Compare_Same);
// Create some hard links. First in the same directory:
- TEST_THAT(link("testfiles/TestDir1/x1/dsfdsfs98.fd",
+ TEST_THAT(EMU_LINK("testfiles/TestDir1/x1/dsfdsfs98.fd",
"testfiles/TestDir1/x1/hardlink1") == 0);
- bbackupd.RunSyncNow();
+ run_bbackupd_sync_with_logging(bbackupd);
TEST_COMPARE(Compare_Same);
- // Now in a different directory
+ BOX_NOTICE("Creating a hard-linked file in a different directory (x2/hardlink2)");
TEST_THAT(mkdir("testfiles/TestDir1/x2", 0755) == 0);
- TEST_THAT(link("testfiles/TestDir1/x1/dsfdsfs98.fd",
+ TEST_THAT(EMU_LINK("testfiles/TestDir1/x1/dsfdsfs98.fd",
"testfiles/TestDir1/x2/hardlink2") == 0);
- bbackupd.RunSyncNow();
+ run_bbackupd_sync_with_logging(bbackupd);
TEST_COMPARE(Compare_Same);
// Now delete one of them
- TEST_THAT(unlink("testfiles/TestDir1/x1/dsfdsfs98.fd") == 0);
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/x1/dsfdsfs98.fd") == 0);
bbackupd.RunSyncNow();
TEST_COMPARE(Compare_Same);
// And another.
- TEST_THAT(unlink("testfiles/TestDir1/x1/hardlink1") == 0);
- bbackupd.RunSyncNow();
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/x1/hardlink1") == 0);
+ run_bbackupd_sync_with_logging(bbackupd);
TEST_COMPARE(Compare_Same);
TEARDOWN_TEST_BBACKUPD();
@@ -1618,7 +1626,7 @@ bool test_backup_pauses_when_store_is_full()
unpack_files("spacetest2", "testfiles/TestDir1");
// Delete a file and a directory
- TEST_THAT(::unlink("testfiles/TestDir1/spacetest/f1") == 0);
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/spacetest/f1") == 0);
#ifdef WIN32
TEST_THAT(::system("rd /s/q testfiles\\TestDir1\\spacetest\\d7") == 0);
#else
@@ -1733,7 +1741,7 @@ bool test_bbackupd_exclusions()
TEST_THAT(unpack_files("spacetest1", "testfiles/TestDir1"));
// Delete a file and a directory
- TEST_THAT(::unlink("testfiles/TestDir1/spacetest/f1") == 0);
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/spacetest/f1") == 0);
#ifdef WIN32
TEST_THAT(::system("rd /s/q testfiles\\TestDir1\\spacetest\\d7") == 0);
@@ -2520,7 +2528,7 @@ bool test_unicode_filenames_can_be_backed_up()
std::string fileToUnlink = "testfiles/restore-" +
dirname + "/" + filename;
- TEST_THAT(::unlink(fileToUnlink.c_str()) == 0);
+ TEST_THAT(EMU_UNLINK(fileToUnlink.c_str()) == 0);
// Check that bbackupquery can get the file when given
// on the command line in system encoding.
@@ -2536,7 +2544,7 @@ bool test_unicode_filenames_can_be_backed_up()
// cannot overwrite a file that exists, so delete it
std::string tmp = "testfiles/" + filename;
- TEST_THAT(::unlink(tmp.c_str()) == 0);
+ TEST_THAT(EMU_UNLINK(tmp.c_str()) == 0);
// And after changing directory to an absolute path
TEST_THAT(bbackupquery(
@@ -2632,7 +2640,7 @@ bool test_sync_allow_script_can_pause_backup()
// check that no backup has run (compare fails)
TEST_COMPARE(Compare_Different);
- TEST_THAT(unlink(sync_control_file) == 0);
+ TEST_THAT(EMU_UNLINK(sync_control_file) == 0);
wait_for_sync_start();
long end_time = time(NULL);
long wait_time = end_time - start_time + 2;
@@ -2670,7 +2678,7 @@ bool test_delete_update_and_symlink_files()
// TODO FIXME dedent
{
// Delete a file
- TEST_THAT(::unlink("testfiles/TestDir1/x1/dsfdsfs98.fd") == 0);
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/x1/dsfdsfs98.fd") == 0);
#ifndef WIN32
// New symlink
@@ -2825,7 +2833,7 @@ bool test_store_error_reporting()
// Check that it did get uploaded, and we have no more errors
TEST_COMPARE(Compare_Same);
- TEST_THAT(::unlink("testfiles/notifyscript.tag") == 0);
+ TEST_THAT(EMU_UNLINK("testfiles/notifyscript.tag") == 0);
// Stop the snapshot bbackupd
TEST_THAT(StopClient());
@@ -2900,7 +2908,7 @@ bool test_store_error_reporting()
// Check that it did get uploaded, and we have no more errors
TEST_COMPARE(Compare_Same);
- TEST_THAT(::unlink("testfiles/notifyscript.tag") == 0);
+ TEST_THAT(EMU_UNLINK("testfiles/notifyscript.tag") == 0);
}
TEARDOWN_TEST_BBACKUPD();
@@ -2924,7 +2932,7 @@ bool test_change_file_to_symlink_and_back()
// Replace symlink with directory, add new directory.
#ifndef WIN32
- TEST_THAT(::unlink("testfiles/TestDir1/symlink-to-dir")
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/symlink-to-dir")
== 0);
#endif
@@ -2949,7 +2957,7 @@ bool test_change_file_to_symlink_and_back()
// And the inverse, replace a directory with a file/symlink
#ifndef WIN32
- TEST_THAT(::unlink("testfiles/TestDir1/x1/dir-to-file"
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/x1/dir-to-file"
"/contents") == 0);
#endif
@@ -2968,7 +2976,7 @@ bool test_change_file_to_symlink_and_back()
BOX_INFO("Replace symlink with directory (which was a symlink)");
#ifndef WIN32
- TEST_THAT(::unlink("testfiles/TestDir1/x1"
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/x1"
"/dir-to-file") == 0);
#endif
@@ -2991,7 +2999,7 @@ bool test_change_file_to_symlink_and_back()
// directories over other old directories.
#ifndef WIN32
- TEST_THAT(::unlink("testfiles/TestDir1/x1/dir-to-file"
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/x1/dir-to-file"
"/contents2") == 0);
#endif
@@ -3039,7 +3047,7 @@ bool test_file_rename_tracking()
TEST_COMPARE(Compare_Same);
#ifdef WIN32
- TEST_THAT(::unlink("testfiles/TestDir1/untracked-2")
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/untracked-2")
== 0);
#endif
@@ -3077,7 +3085,7 @@ bool test_file_rename_tracking()
TEST_COMPARE(Compare_Same);
#ifdef WIN32
- TEST_THAT(::unlink("testfiles/TestDir1/tracked-2")
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/tracked-2")
== 0);
#endif
@@ -3092,7 +3100,7 @@ bool test_file_rename_tracking()
// case which went wrong: rename a tracked file
// over a deleted file
BOX_INFO("Rename an existing file over a deleted file");
- TEST_THAT(::unlink("testfiles/TestDir1/x1/dsfdsfs98.fd") == 0);
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/x1/dsfdsfs98.fd") == 0);
TEST_THAT(::rename("testfiles/TestDir1/df9834.dsf",
"testfiles/TestDir1/x1/dsfdsfs98.fd") == 0);
@@ -3872,7 +3880,7 @@ bool test_restore_deleted_files()
bbackupd.RunSyncNow();
TEST_COMPARE(Compare_Same);
- TEST_THAT(::unlink("testfiles/TestDir1/f1.dat") == 0);
+ TEST_THAT(EMU_UNLINK("testfiles/TestDir1/f1.dat") == 0);
#ifdef WIN32
TEST_THAT(::system("rd /s/q testfiles\\TestDir1\\x1") == 0);
#else
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 17:42:26 +0000