Fix Glacier tests

Creates a class which is usable as a global fixture for handling a
Glacier instance. Fixes the issue in the previous version where flock
was used, but in conjunction with --daemon and a pidfile, so it only
prevented concurrent startup, not concurrent execution.

1 files changed, 11 insertions, 24 deletions

diff --git a/netfs/unittests/testGlacier.cpp b/netfs/unittests/testGlacier.cpp
index 5467c41..afe3475 100644
--- a/netfs/unittests/testGlacier.cpp
+++ b/netfs/unittests/testGlacier.cpp
@@ -1,35 +1,22 @@
 #define BOOST_TEST_MODULE TestNetFSGlacier
+#include <boost/test/unit_test.hpp>
+
 #include "mockDaemon.h"
 #include "mockFuse.h"
-#include <boost/scope_exit.hpp>
-#include <boost/test/unit_test.hpp>
+#include "mockGlacier.h"
 #include <definedDirs.h>
 
 const std::string testEndpoint("tcp -h localhost -p 12013");
-#define PID "/tmp/glacier.pid"
+
+BOOST_TEST_GLOBAL_FIXTURE(Glacier);
 
 BOOST_AUTO_TEST_CASE(withRouter)
 {
-	std::filesystem::remove(PID);
-	BOOST_REQUIRE_EQUAL(0,
-			system("flock /tmp/glacier.lock /usr/bin/glacier2router --Glacier2.Client.Endpoints='tcp -p 14063' "
-				   "--Glacier2.PermissionsVerifier=Glacier2/NullPermissionsVerifier --daemon --pidfile " PID));
-	sleep(1);
-
-	BOOST_SCOPE_EXIT(void)
-	{
-		BOOST_REQUIRE_EQUAL(0, system("kill $(cat " PID ")"));
-		std::filesystem::remove(PID);
-	}
-	BOOST_SCOPE_EXIT_END;
-
-	{
-		MockDaemonHost daemon(testEndpoint, {"--NetFSD.ConfigPath=" + (rootDir / "defaultDaemon.xml").string()});
-		FuseMockHost fuse(testEndpoint,
-				{(rootDir / "defaultFuse.xml:testvol").string(), (rootDir / "test").string(),
-						"--Ice.Default.Router=Glacier2/router:tcp -h localhost -p 14063"});
+	MockDaemonHost daemon(testEndpoint, {"--NetFSD.ConfigPath=" + (rootDir / "defaultDaemon.xml").string()});
+	FuseMockHost fuse(testEndpoint,
+			{(rootDir / "defaultFuse.xml:testvol").string(), (rootDir / "test").string(),
+					"--Ice.Default.Router=Glacier2/router:tcp -h localhost -p 14063"});
 
-		struct statvfs s { };
-		BOOST_REQUIRE_EQUAL(0, fuse.fuse->statfs("/", &s));
-	}
+	struct statvfs s { };
+	BOOST_CHECK_EQUAL(0, fuse.fuse->statfs("/", &s));
 }