svn commit: r345133 - projects/fuse2/tests/sys/fs/fuse

[Alan Somers]

Author: asomers
Date: Thu Mar 14 14:59:59 2019
New Revision: 345133
URL: https://svnweb.freebsd.org/changeset/base/345133

Log:
  fuse(4): skip the Write.append test unless vfs.fuse.sync_resize==0
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/fuse2/tests/sys/fs/fuse/write.cc

Modified: projects/fuse2/tests/sys/fs/fuse/write.cc
==============================================================================
--- projects/fuse2/tests/sys/fs/fuse/write.cc	Thu Mar 14 14:34:36 2019	(r345132)
+++ projects/fuse2/tests/sys/fs/fuse/write.cc	Thu Mar 14 14:59:59 2019	(r345133)
@@ -65,6 +65,18 @@ void expect_release(uint64_t ino, ProcessMockerT r)
 	).WillRepeatedly(Invoke(r));
 }
 
+void require_sync_resize_0() {
+	const char *sync_resize_node = "vfs.fuse.sync_resize";
+	int val = 0;
+	size_t size = sizeof(val);
+
+	ASSERT_EQ(0, sysctlbyname(sync_resize_node, &val, &size, NULL, 0))
+		<< strerror(errno);
+	if (val != 0)
+		FAIL() << "vfs.fuse.sync_resize must be set to 0 for this test."
+			"  That sysctl will probably be removed soon.";
+}
+
 };
 
 class AioWrite: public Write {
@@ -87,7 +99,6 @@ class WriteThrough: public Write {
 
 virtual void SetUp() {
 	const char *cache_mode_node = "vfs.fuse.data_cache_mode";
-	const char *sync_resize_node = "vfs.fuse.sync_resize";
 	int val = 0;
 	size_t size = sizeof(val);
 
@@ -98,12 +109,6 @@ virtual void SetUp() {
 		FAIL() << "vfs.fuse.data_cache_mode must be set to 1 "
 			"(writethrough) for this test";
 
-	ASSERT_EQ(0, sysctlbyname(sync_resize_node, &val, &size, NULL, 0))
-		<< strerror(errno);
-	if (val != 0)
-		FAIL() << "vfs.fuse.sync_resize must be set to 0 for this test."
-			"  That sysctl will probably be removed soon.";
-
 	FuseTest::SetUp();
 }
 
@@ -182,6 +187,8 @@ TEST_F(Write, append)
 	 */
 	uint64_t initial_offset = m_maxbcachebuf;
 	int fd;
+
+	require_sync_resize_0();
 
 	expect_lookup(RELPATH, ino);
 	expect_open(ino, 0, 1);