qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, "Hanna Reitz" <hreitz@redhat.com>,
	"Daniel Berrange" <berrange@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Michael Roth" <michael.roth@amd.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Kevin Wolf" <kwolf@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
	"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
	"John Snow" <jsnow@redhat.com>
Subject: [PATCH v3 13/13] iotests: fix copy-before-write for macOS and FreeBSD
Date: Thu,  7 Jul 2022 00:03:10 -0400	[thread overview]
Message-ID: <20220707040310.4163682-14-jsnow@redhat.com> (raw)
In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com>

From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

Do not merge: this is a copy of Vladimir's fix that will be taken in
through the iotests tree.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/qemu-iotests/tests/copy-before-write | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/qemu-iotests/tests/copy-before-write b/tests/qemu-iotests/tests/copy-before-write
index 16efebbf8f0..56937b9dfff 100755
--- a/tests/qemu-iotests/tests/copy-before-write
+++ b/tests/qemu-iotests/tests/copy-before-write
@@ -192,6 +192,11 @@ read 1048576/1048576 bytes at offset 0
 
     def test_timeout_break_guest(self):
         log = self.do_cbw_timeout('break-guest-write')
+        # macOS and FreeBSD tend to represent ETIMEDOUT as
+        # "Operation timed out", when Linux prefer
+        # "Connection timed out"
+        log = log.replace('Operation timed out',
+                          'Connection timed out')
         self.assertEqual(log, """\
 wrote 524288/524288 bytes at offset 0
 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-- 
2.34.3



      parent reply	other threads:[~2022-07-07  4:21 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-07  4:02 [PATCH v3 00/13] Improve reliability of VM tests John Snow
2022-07-07  4:02 ` [PATCH v3 01/13] qga: treat get-guest-fsinfo as "best effort" John Snow
2022-07-07  8:17   ` Daniel P. Berrangé
2022-07-07  8:40   ` Marc-André Lureau
2022-07-07 15:23     ` John Snow
2022-07-07  4:02 ` [PATCH v3 02/13] tests/vm: use 'cp' instead of 'ln' for temporary vm images John Snow
2022-07-07  8:18   ` Daniel P. Berrangé
2022-07-07  4:03 ` [PATCH v3 03/13] tests/vm: switch CentOS 8 to CentOS 8 Stream John Snow
2022-07-07  8:18   ` Daniel P. Berrangé
2022-07-07  4:03 ` [PATCH v3 04/13] tests/vm: switch centos.aarch64 " John Snow
2022-07-07  8:22   ` Daniel P. Berrangé
2022-07-07  4:03 ` [PATCH v3 05/13] tests/vm: update sha256sum for ubuntu.aarch64 John Snow
2022-07-07  8:23   ` Daniel P. Berrangé
2022-07-07 11:03   ` Richard Henderson
2022-07-07  4:03 ` [PATCH v3 06/13] tests/vm: remove ubuntu.i386 VM test John Snow
2022-07-07  8:23   ` Daniel P. Berrangé
2022-07-07  4:03 ` [PATCH v3 07/13] tests/vm: remove duplicate 'centos' " John Snow
2022-07-07  8:24   ` Daniel P. Berrangé
2022-07-07  4:03 ` [PATCH v3 08/13] tests/vm: add 1GB extra memory per core John Snow
2022-07-07  8:27   ` Daniel P. Berrangé
2022-07-07  4:03 ` [PATCH v3 09/13] tests/vm: upgrade Ubuntu 18.04 VM to 20.04 John Snow
2022-07-07  8:31   ` Daniel P. Berrangé
2022-07-07 11:05   ` Richard Henderson
2022-07-07 15:40     ` John Snow
2022-07-07  4:03 ` [PATCH v3 10/13] tests/vm: Remove docker cross-compile test from CentOS VM John Snow
2022-07-07  8:32   ` Daniel P. Berrangé
2022-07-07 15:48     ` John Snow
2022-07-07 15:52       ` Daniel P. Berrangé
2022-07-07  4:03 ` [PATCH v3 11/13] tests/qemu-iotests: hotfix for 307, 223 output John Snow
2022-07-07  4:03 ` [PATCH v3 12/13] tests/qemu-iotests: skip 108 when FUSE is not loaded John Snow
2022-07-07  4:03 ` John Snow [this message]

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=20220707040310.4163682-14-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=berrange@redhat.com \
    --cc=bleal@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=hreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=michael.roth@amd.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=vsementsov@yandex-team.ru \
    --cc=wainersm@redhat.com \
    /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).