Fix cleanup of backupstore specialised tests

In case of exception, ensure that teardown code is always run, to release filesystem lock before deleting files in standard tearDown(). (cherry picked from commit 69f205b)
boxbackup · Jan 15, 2018 · 1a96f95 · 1a96f95
1 parent d98c657
commit 1a96f95
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/test/backupstore/testbackupstore.cpp b/test/backupstore/testbackupstore.cpp
@@ -219,7 +219,9 @@ bool setup_test_backupstore_specialised(const std::string& spec_name,
 
 #define SETUP_TEST_BACKUPSTORE_SPECIALISED(name, control) \
 	SETUP_SPECIALISED(name); \
-	TEST_THAT_OR(setup_test_backupstore_specialised(name, control), FAIL);
+	TEST_THAT_OR(setup_test_backupstore_specialised(name, control), FAIL); \
+	try \
+	{ // left open for TEARDOWN_TEST_BACKUPSTORE_SPECIALISED()
 
 //! Checks account for errors and shuts down daemons at end of every test.
 bool teardown_test_backupstore()
@@ -258,13 +260,25 @@ bool teardown_test_backupstore_specialised(const std::string& spec_name,
 }
 
 #define TEARDOWN_TEST_BACKUPSTORE_SPECIALISED(name, control) \
-	if (ServerIsAlive(bbstored_pid)) \
-		StopServer(); \
-	if(control.GetCurrentFileSystem() != NULL) \
+		if (ServerIsAlive(bbstored_pid)) \
+			StopServer(); \
+		if(control.GetCurrentFileSystem() != NULL) \
+		{ \
+			control.GetCurrentFileSystem()->ReleaseLock(); \
+		} \
+		TEST_THAT_OR(teardown_test_backupstore_specialised(name, control), FAIL); \
+	} \
+	catch (BoxException &e) \
 	{ \
-		control.GetCurrentFileSystem()->ReleaseLock(); \
+		if (ServerIsAlive(bbstored_pid)) \
+			StopServer(); \
+		if(control.GetCurrentFileSystem() != NULL) \
+		{ \
+			control.GetCurrentFileSystem()->ReleaseLock(); \
+		} \
+		TEST_THAT_OR(teardown_test_backupstore_specialised(name, control), FAIL); \
+		throw; \
 	} \
-	TEST_THAT_OR(teardown_test_backupstore_specialised(name, control), FAIL); \
 	TEARDOWN();
 
 // Nice random data for testing written files