Refactor Start/StopSimulator out of testbackupstore

To enable reuse by testbackupstorepatch. (cherry picked from commit 92d3f32)
boxbackup · Jan 14, 2019 · 05b9202 · 05b9202
1 parent 254c099
commit 05b9202
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 19 deletions.
diff --git a/lib/backupstore/StoreTestUtils.cpp b/lib/backupstore/StoreTestUtils.cpp
@@ -54,7 +54,7 @@ bool delete_account()
 }
 
 std::vector<uint32_t> ExpectedRefCounts;
-int bbstored_pid = 0, bbackupd_pid = 0;
+int bbstored_pid = 0, bbackupd_pid = 0, s3simulator_pid = 0;
 
 void set_refcount(int64_t ObjectID, uint32_t RefCount)
 {
@@ -298,3 +298,40 @@ bool StopClient(bool wait_for_process)
 	return result;
 }
 
+bool StartSimulator()
+{
+	s3simulator_pid = StartDaemon(s3simulator_pid,
+		"../../bin/s3simulator/s3simulator " + bbstored_args +
+		" testfiles/s3simulator.conf", "testfiles/s3simulator.pid");
+	return s3simulator_pid != 0;
+}
+
+bool StopSimulator()
+{
+	bool result = StopDaemon(s3simulator_pid, "testfiles/s3simulator.pid",
+		"s3simulator.memleaks", true);
+	s3simulator_pid = 0;
+	return result;
+}
+
+bool kill_running_daemons()
+{
+	bool success = true;
+
+	if(FileExists("testfiles/bbstored.pid"))
+	{
+		TEST_THAT_OR(KillServer("testfiles/bbstored.pid", true), success = false);
+	}
+
+	if(FileExists("testfiles/bbackupd.pid"))
+	{
+		TEST_THAT_OR(KillServer("testfiles/bbackupd.pid", true), success = false);
+	}
+
+	if(FileExists("testfiles/s3simulator.pid"))
+	{
+		TEST_THAT_OR(KillServer("testfiles/s3simulator.pid", true), success = false);
+	}
+
+	return success;
+}
diff --git a/lib/backupstore/StoreTestUtils.h b/lib/backupstore/StoreTestUtils.h
@@ -77,6 +77,12 @@ bool StartClient(const std::string& bbackupd_conf_file = "testfiles/bbackupd.con
 //! Stops the currently running bbackupd client.
 bool StopClient(bool wait_for_process = false);
 
+bool StartSimulator();
+
+bool StopSimulator();
+
+bool kill_running_daemons();
+
 //! Creates the standard test account, for example after delete_account().
 bool create_account(int soft, int hard);
 

diff --git a/lib/common/Test.h b/lib/common/Test.h
@@ -32,6 +32,10 @@
 #define TEST_RETURN(actual, expected) TEST_EQUAL((expected << 8), actual);
 #endif
 
+#define DEFAULT_BBSTORED_CONFIG_FILE "testfiles/bbstored.conf"
+#define DEFAULT_BBACKUPD_CONFIG_FILE "testfiles/bbackupd.conf"
+#define DEFAULT_S3_CACHE_DIR "testfiles/bbackupd-cache"
+
 extern int num_failures;
 extern int first_fail_line;
 extern int num_tests_selected;

diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp
@@ -96,7 +96,6 @@
 #define TIME_TO_WAIT_FOR_BACKUP_OPERATION 12
 #define SHORT_TIMEOUT 5000
 #define BACKUP_ERROR_DELAY_SHORTENED 10
-#define DEFAULT_BBACKUPD_CONFIG_FILE "testfiles/bbackupd.conf"
 
 void wait_for_backup_operation(const char* message)
 {
@@ -410,23 +409,6 @@ bool configure_bbackupd(BackupDaemon& bbackupd, const std::string& config_file)
 	return true;
 }
 
-bool kill_running_daemons()
-{
-	bool success = true;
-
-	if(FileExists("testfiles/bbstored.pid"))
-	{
-		TEST_THAT_OR(KillServer("testfiles/bbstored.pid", true), success = false);
-	}
-
-	if(FileExists("testfiles/bbackupd.pid"))
-	{
-		TEST_THAT_OR(KillServer("testfiles/bbackupd.pid", true), success = false);
-	}
-
-	return success;
-}
-
 bool prepare_test_with_client_daemon(BackupDaemon& bbackupd, bool do_unpack_files = true,
 	bool do_start_bbstored = true)
 {