d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fusefs: fix some intermittency in the Kqueue.data test

Browse Source 
Expect the FUSE_GETATTR operations for bar and baz to come in either order.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Alan Somers 2019-05-15 19:23:29 +00:00
parent 3d15b234a4
commit 6fd2d8e148
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/sys/fs/fusefs/dev_fuse_poll.cc
View File

@ -121,6 +121,7 @@ TEST_F(Kqueue, data)
uint64_t foo_ino = 42;
uint64_t bar_ino = 43;
uint64_t baz_ino = 44;
Sequence seq;
ASSERT_EQ(0, sem_init(&sem0, 0, 0)) << strerror(errno);
ASSERT_EQ(0, sem_init(&sem1, 0, 0)) << strerror(errno);
@ -169,10 +170,11 @@ TEST_F(Kqueue, data)
EXPECT_CALL(*m_mock, process(
ResultOf([=](auto in) {
return (in->header.opcode == FUSE_GETATTR &&
in->header.nodeid == bar_ino);
(in->header.nodeid == bar_ino ||
in->header.nodeid == baz_ino));
}, Eq(true)),
_)
)
).InSequence(seq)
.WillOnce(Invoke(ReturnImmediate([&](auto in, auto out) {
nready1 = m_mock->m_nready;
out->header.unique = in->header.unique;
@ -182,10 +184,11 @@ TEST_F(Kqueue, data)
EXPECT_CALL(*m_mock, process(
ResultOf([=](auto in) {
return (in->header.opcode == FUSE_GETATTR &&
in->header.nodeid == baz_ino);
(in->header.nodeid == bar_ino ||
in->header.nodeid == baz_ino));
}, Eq(true)),
_)
)
).InSequence(seq)
.WillOnce(Invoke(ReturnImmediate([&](auto in, auto out) {
nready2 = m_mock->m_nready;
out->header.unique = in->header.unique;