svn commit: r349445 - projects/fuse2/tests/sys/fs/fusefs

[Alan Somers]

Author: asomers
Date: Wed Jun 26 23:10:20 2019
New Revision: 349445
URL: https://svnweb.freebsd.org/changeset/base/349445

Log:
  fusefs: tighten expectations in mmap tests
  
  In r349378 I fixed mmap's habit of reading more data than was available.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/fuse2/tests/sys/fs/fusefs/read.cc

Modified: projects/fuse2/tests/sys/fs/fusefs/read.cc
==============================================================================
--- projects/fuse2/tests/sys/fs/fusefs/read.cc	Wed Jun 26 22:06:40 2019	(r349444)
+++ projects/fuse2/tests/sys/fs/fusefs/read.cc	Wed Jun 26 23:10:20 2019	(r349445)
@@ -563,14 +563,13 @@ TEST_F(Read, mmap)
 
 	expect_lookup(RELPATH, ino, bufsize);
 	expect_open(ino, 0, 1);
-	/* mmap may legitimately try to read more data than is available */
 	EXPECT_CALL(*m_mock, process(
 		ResultOf([=](auto in) {
 			return (in.header.opcode == FUSE_READ &&
 				in.header.nodeid == ino &&
 				in.body.read.fh == Read::FH &&
 				in.body.read.offset == 0 &&
-				in.body.read.size >= bufsize);
+				in.body.read.size == bufsize);
 		}, Eq(true)),
 		_)
 	).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) {
@@ -608,16 +607,15 @@ TEST_F(Read, mmap_eof)
 
 	len = getpagesize();
 
-	expect_lookup(RELPATH, ino, 100000);
+	expect_lookup(RELPATH, ino, m_maxbcachebuf);
 	expect_open(ino, 0, 1);
-	/* mmap may legitimately try to read more data than is available */
 	EXPECT_CALL(*m_mock, process(
 		ResultOf([=](auto in) {
 			return (in.header.opcode == FUSE_READ &&
 				in.header.nodeid == ino &&
 				in.body.read.fh == Read::FH &&
 				in.body.read.offset == 0 &&
-				in.body.read.size >= bufsize);
+				in.body.read.size == (uint32_t)m_maxbcachebuf);
 		}, Eq(true)),
 		_)
 	).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) {
@@ -802,14 +800,13 @@ TEST_F(Read, sendfile)
 
 	expect_lookup(RELPATH, ino, bufsize);
 	expect_open(ino, 0, 1);
-	/* Like mmap, sendfile may request more data than is available */
 	EXPECT_CALL(*m_mock, process(
 		ResultOf([=](auto in) {
 			return (in.header.opcode == FUSE_READ &&
 				in.header.nodeid == ino &&
 				in.body.read.fh == Read::FH &&
 				in.body.read.offset == 0 &&
-				in.body.read.size >= bufsize);
+				in.body.read.size == bufsize);
 		}, Eq(true)),
 		_)
 	).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) {