From 356768f8aa07661f52625f10b90a3affa562dd8a Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Thu, 2 Jan 2020 21:10:22 +0000 Subject: Update to new NetFS interface --- unittests/config.cpp | 3 +-- unittests/core.cpp | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'unittests') diff --git a/unittests/config.cpp b/unittests/config.cpp index 460a35f..db7570e 100644 --- a/unittests/config.cpp +++ b/unittests/config.cpp @@ -75,8 +75,7 @@ BOOST_DATA_TEST_CASE(uid_gid_override_list, BOOST_CHECK_NO_THROW(c.s->ice_ping()); auto dir = c.v->opendir(c.env, path); - auto dir2 = Ice::checkedCast(dir); - for (const auto & dirent : dir2->listdir()) { + for (const auto & dirent : dir->listdir()) { BOOST_TEST_CONTEXT(dirent.first) { BOOST_CHECK_EQUAL(dirent.second.uid, uid); BOOST_CHECK_EQUAL(dirent.second.gid, gid); diff --git a/unittests/core.cpp b/unittests/core.cpp index 6eef46a..ba25e88 100644 --- a/unittests/core.cpp +++ b/unittests/core.cpp @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE( unsupported_rofs_ops ) BOOST_CHECK_THROW_SYSTEMERROR(v->mknod(env, {}, {}, {}), EROFS); BOOST_CHECK_THROW_SYSTEMERROR(v->symlink(env, {}, {}), EROFS); BOOST_CHECK_THROW_SYSTEMERROR(v->link(env, {}, {}), EROFS); - BOOST_CHECK_THROW_SYSTEMERROR(v->rename(env, {}, {}), EROFS); + BOOST_CHECK_THROW_SYSTEMERROR(v->rename(env, {}, {}, {}), EROFS); BOOST_CHECK_THROW_SYSTEMERROR(v->chmod(env, {}, {}), EROFS); BOOST_CHECK_THROW_SYSTEMERROR(v->chown(env, {}, {}, {}), EROFS); BOOST_CHECK_THROW_SYSTEMERROR(v->utimens(env, {}, {}, {}, {}, {}), EROFS); @@ -251,9 +251,7 @@ BOOST_DATA_TEST_CASE( openDirList, DIRPATHS ^ DIRCONTENTMODES, path, contents ) { auto dir = v->opendir(env, path); BOOST_REQUIRE(dir); - auto dir2 = Ice::checkedCast(dir); - BOOST_REQUIRE(dir2); - auto list = dir2->listdir(); + auto list = dir->listdir(); BOOST_REQUIRE_EQUAL(contents.size(), list.size()); for (const auto & c : contents) { auto li = list.find(std::get<0>(c)); -- cgit v1.2.3