qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Ilya Leoshkevich <iii@linux.ibm.com>,
	"Daniel P. Berrange" <berrange@redhat.com>
Subject: [PULL 11/12] test-util-filemonitor: Adapt to the FreeBSD inotify rename semantics
Date: Tue,  6 Feb 2024 11:43:46 +0100	[thread overview]
Message-ID: <20240206104347.238825-12-thuth@redhat.com> (raw)
In-Reply-To: <20240206104347.238825-1-thuth@redhat.com>

From: Ilya Leoshkevich <iii@linux.ibm.com>

Unlike on Linux, on FreeBSD renaming a file when the destination
already exists results in an IN_DELETE event for that existing file:

    $ FILEMONITOR_DEBUG=1 build/tests/unit/test-util-filemonitor
    Rename /tmp/test-util-filemonitor-K13LI2/fish/one.txt -> /tmp/test-util-filemonitor-K13LI2/two.txt
    Event id=200000000 event=2 file=one.txt
    Queue event id 200000000 event 2 file one.txt
    Queue event id 100000000 event 2 file two.txt
    Queue event id 100000002 event 2 file two.txt
    Queue event id 100000000 event 0 file two.txt
    Queue event id 100000002 event 0 file two.txt
    Event id=100000000 event=0 file=two.txt
    Expected event 0 but got 2

This difference in behavior is not expected to break the real users, so
teach the test to accept it.

Suggested-by: "Daniel P. Berrange" <berrange@redhat.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-ID: <20240206002344.12372-4-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/unit/test-util-filemonitor.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/unit/test-util-filemonitor.c b/tests/unit/test-util-filemonitor.c
index a22de27595..02e67fc96a 100644
--- a/tests/unit/test-util-filemonitor.c
+++ b/tests/unit/test-util-filemonitor.c
@@ -360,6 +360,14 @@ test_file_monitor_events(void)
         { .type = QFILE_MONITOR_TEST_OP_EVENT,
           .filesrc = "one.txt", .watchid = &watch4,
           .eventid = QFILE_MONITOR_EVENT_DELETED },
+#ifdef __FreeBSD__
+        { .type = QFILE_MONITOR_TEST_OP_EVENT,
+          .filesrc = "two.txt", .watchid = &watch0,
+          .eventid = QFILE_MONITOR_EVENT_DELETED },
+        { .type = QFILE_MONITOR_TEST_OP_EVENT,
+          .filesrc = "two.txt", .watchid = &watch2,
+          .eventid = QFILE_MONITOR_EVENT_DELETED },
+#endif
         { .type = QFILE_MONITOR_TEST_OP_EVENT,
           .filesrc = "two.txt", .watchid = &watch0,
           .eventid = QFILE_MONITOR_EVENT_CREATED },
-- 
2.43.0



  parent reply	other threads:[~2024-02-06 10:45 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-06 10:43 [PULL 00/12] s390x, tests and misc. patches Thomas Huth
2024-02-06 10:43 ` [PULL 01/12] hw/scsi/lsi53c895a: add missing decrement of reentrancy counter Thomas Huth
2024-02-06 10:43 ` [PULL 02/12] target/ppc/cpu-models: Rename power5+ and power7+ for new QOM naming rules Thomas Huth
2024-02-06 10:43 ` [PULL 03/12] docs/about: Deprecate the old "power5+" and "power7+" CPU names Thomas Huth
2024-02-06 10:43 ` [PULL 04/12] target/s390x: Emulate CVDG Thomas Huth
2024-02-06 10:43 ` [PULL 05/12] target/s390x: Emulate CVB, CVBY and CVBG Thomas Huth
2024-02-06 10:43 ` [PULL 06/12] tests/tcg/s390x: Test CONVERT TO DECIMAL Thomas Huth
2024-02-06 10:43 ` [PULL 07/12] tests/tcg/s390x: Test CONVERT TO BINARY Thomas Huth
2024-02-06 10:43 ` [PULL 08/12] target/s390x: Prefer fast cpu_env() over slower CPU QOM cast macro Thomas Huth
2024-02-06 10:43 ` [PULL 09/12] tests/vm: Set UseDNS=no in the sshd configuration Thomas Huth
2024-02-06 10:43 ` [PULL 10/12] tests/vm/freebsd: Reload " Thomas Huth
2024-02-06 10:43 ` Thomas Huth [this message]
2024-02-06 10:43 ` [PULL 12/12] meson: Link with libinotify on FreeBSD Thomas Huth
2024-02-08 16:07 ` [PULL 00/12] s390x, tests and misc. patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240206104347.238825-12-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=berrange@redhat.com \
    --cc=iii@linux.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).