diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-07-20 01:46:12 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-07-20 01:46:12 +0100 |
| commit | c443841605388835d2751f01f6d209ff3cbddd57 (patch) | |
| tree | 025aa589d5cf079f288ab88a740205251918379d /netfs/unittests/testGlacier.cpp | |
| parent | Start mock clients with a real configuration file that has specific parts rep... (diff) | |
| download | netfs-c443841605388835d2751f01f6d209ff3cbddd57.tar.bz2 netfs-c443841605388835d2751f01f6d209ff3cbddd57.tar.xz netfs-c443841605388835d2751f01f6d209ff3cbddd57.zip | |
Switch to the StringSeq interface where possible because it's considerably less annoying
Diffstat (limited to 'netfs/unittests/testGlacier.cpp')
| -rw-r--r-- | netfs/unittests/testGlacier.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/netfs/unittests/testGlacier.cpp b/netfs/unittests/testGlacier.cpp index 8ee055d..90daaef 100644 --- a/netfs/unittests/testGlacier.cpp +++ b/netfs/unittests/testGlacier.cpp @@ -25,16 +25,14 @@ BOOST_AUTO_TEST_CASE ( withRouter ) } BOOST_SCOPE_EXIT_END; { - char * glacierFuseArgv[] = { - strdup((RootDir / "defaultFuse.xml:testvol").string().c_str()), - strdup((RootDir / "test").string().c_str()), - strdup("--Ice.Default.Router=Glacier2/router:tcp -h localhost -p 4063") - }; - MockDaemonHost daemon(testEndpoint, { "--NetFSD.ConfigPath=" + (RootDir / "defaultDaemon.xml").string() }); - FuseMockHost fuse(testEndpoint, 3, glacierFuseArgv); + FuseMockHost fuse(testEndpoint, { + (RootDir / "defaultFuse.xml:testvol").string(), + (RootDir / "test").string(), + "--Ice.Default.Router=Glacier2/router:tcp -h localhost -p 4063" + }); struct statvfs s; BOOST_REQUIRE_EQUAL(0, fuse.fuse->statfs("/", &s)); |