From owner-svn-src-projects@freebsd.org Wed May 15 19:23:30 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1EE8159ED6D for ; Wed, 15 May 2019 19:23:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 54E0B6D2E7; Wed, 15 May 2019 19:23:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4624DE08D; Wed, 15 May 2019 19:23:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4FJNUcC099776; Wed, 15 May 2019 19:23:30 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4FJNUNw099775; Wed, 15 May 2019 19:23:30 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201905151923.x4FJNUNw099775@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 15 May 2019 19:23:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r347630 - projects/fuse2/tests/sys/fs/fusefs X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/tests/sys/fs/fusefs X-SVN-Commit-Revision: 347630 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 54E0B6D2E7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 May 2019 19:23:30 -0000 Author: asomers Date: Wed May 15 19:23:29 2019 New Revision: 347630 URL: https://svnweb.freebsd.org/changeset/base/347630 Log: fusefs: fix some intermittency in the Kqueue.data test Expect the FUSE_GETATTR operations for bar and baz to come in either order. Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/tests/sys/fs/fusefs/dev_fuse_poll.cc Modified: projects/fuse2/tests/sys/fs/fusefs/dev_fuse_poll.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fusefs/dev_fuse_poll.cc Wed May 15 18:56:42 2019 (r347629) +++ projects/fuse2/tests/sys/fs/fusefs/dev_fuse_poll.cc Wed May 15 19:23:29 2019 (r347630) @@ -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;