Date: Fri, 5 Apr 2019 15:04:25 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345949 - projects/fuse2/tests/sys/fs/fusefs Message-ID: <201904051504.x35F4PBc048360@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Fri Apr 5 15:04:25 2019 New Revision: 345949 URL: https://svnweb.freebsd.org/changeset/base/345949 Log: fusefs: reenable some fsyncdir tests These tests were actually fixed by r345398, r345390 and r345392, but I neglected to reenable them. Too bad googletest doesn't have the notion of an Expected Failure like ATF does. PR: 236474, 236473 Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/tests/sys/fs/fusefs/fsync.cc projects/fuse2/tests/sys/fs/fusefs/fsyncdir.cc Modified: projects/fuse2/tests/sys/fs/fusefs/fsync.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fusefs/fsync.cc Fri Apr 5 14:44:23 2019 (r345948) +++ projects/fuse2/tests/sys/fs/fusefs/fsync.cc Fri Apr 5 15:04:25 2019 (r345949) @@ -56,6 +56,11 @@ void expect_fsync(uint64_t ino, uint32_t flags, int er ResultOf([=](auto in) { return (in->header.opcode == FUSE_FSYNC && in->header.nodeid == ino && + /* + * TODO: reenable pid check after fixing + * bug 236379 + */ + //(pid_t)in->header.pid == getpid() && in->body.fsync.fh == FH && in->body.fsync.fsync_flags == flags); }, Eq(true)), @@ -76,7 +81,7 @@ void expect_write(uint64_t ino, uint64_t size, const v }; /* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236379 */ -TEST_F(Fsync, DISABLED_aio_fsync) +TEST_F(Fsync, aio_fsync) { const char FULLPATH[] = "mountpoint/some_file.txt"; const char RELPATH[] = "some_file.txt"; Modified: projects/fuse2/tests/sys/fs/fusefs/fsyncdir.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fusefs/fsyncdir.cc Fri Apr 5 14:44:23 2019 (r345948) +++ projects/fuse2/tests/sys/fs/fusefs/fsyncdir.cc Fri Apr 5 15:04:25 2019 (r345949) @@ -56,6 +56,10 @@ void expect_fsyncdir(uint64_t ino, uint32_t flags, int ResultOf([=](auto in) { return (in->header.opcode == FUSE_FSYNCDIR && in->header.nodeid == ino && + /* + * TODO: reenable pid check after fixing + * bug 236379 + */ //(pid_t)in->header.pid == getpid() && in->body.fsyncdir.fh == FH && in->body.fsyncdir.fsync_flags == flags); @@ -72,9 +76,7 @@ void expect_lookup(const char *relpath, uint64_t ino) }; /* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236379 */ -/* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236473 */ -/* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236474 */ -TEST_F(FsyncDir, DISABLED_aio_fsync) +TEST_F(FsyncDir, aio_fsync) { const char FULLPATH[] = "mountpoint/some_file.txt"; const char RELPATH[] = "some_file.txt"; @@ -98,9 +100,7 @@ TEST_F(FsyncDir, DISABLED_aio_fsync) /* Deliberately leak fd. close(2) will be tested in release.cc */ } -/* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236473 */ -/* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236474 */ -TEST_F(FsyncDir, DISABLED_eio) +TEST_F(FsyncDir, eio) { const char FULLPATH[] = "mountpoint/some_dir"; const char RELPATH[] = "some_dir"; @@ -124,7 +124,6 @@ TEST_F(FsyncDir, DISABLED_eio) * subsequent calls to VOP_FSYNC will succeed automatically without being sent * to the filesystem daemon */ -/* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236474 */ /* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236557 */ TEST_F(FsyncDir, DISABLED_enosys) { @@ -147,8 +146,7 @@ TEST_F(FsyncDir, DISABLED_enosys) /* Deliberately leak fd. close(2) will be tested in release.cc */ } -/* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236474 */ -TEST_F(FsyncDir, DISABLED_fsyncdata) +TEST_F(FsyncDir, fsyncdata) { const char FULLPATH[] = "mountpoint/some_dir"; const char RELPATH[] = "some_dir"; @@ -170,9 +168,7 @@ TEST_F(FsyncDir, DISABLED_fsyncdata) * Unlike regular files, the kernel doesn't know whether a directory is or * isn't dirty, so fuse(4) should always send FUSE_FSYNCDIR on fsync(2) */ -/* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236473 */ -/* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236474 */ -TEST_F(FsyncDir, DISABLED_fsync) +TEST_F(FsyncDir, fsync) { const char FULLPATH[] = "mountpoint/some_dir"; const char RELPATH[] = "some_dir";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904051504.x35F4PBc048360>