Fix 5f66805

Don't swallow exceptions by returning before rethrowing them
boxbackup · Jan 15, 2018 · 0f72030 · 0f72030
1 parent fb2af31
commit 0f72030
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/test/backupstore/testbackupstore.cpp b/test/backupstore/testbackupstore.cpp
@@ -270,13 +270,15 @@ bool teardown_test_backupstore_specialised(const std::string& spec_name,
 	} \
 	catch (BoxException &e) \
 	{ \
+		BOX_WARNING("Specialised test failed with exception, cleaning up: " << \
+			name << ": " << e.what()); \
 		if (ServerIsAlive(bbstored_pid)) \
 			StopServer(); \
 		if(control.GetCurrentFileSystem() != NULL) \
 		{ \
 			control.GetCurrentFileSystem()->ReleaseLock(); \
 		} \
-		TEST_THAT_OR(teardown_test_backupstore_specialised(name, control), FAIL); \
+		TEST_THAT(teardown_test_backupstore_specialised(name, control)); \
 		throw; \
 	} \
 	TEARDOWN();