[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 13/13] iotests: fix copy-before-write for macOS and FreeBSD
From: |
John Snow |
Subject: |
[PATCH v3 13/13] iotests: fix copy-before-write for macOS and FreeBSD |
Date: |
Thu, 7 Jul 2022 00:03:10 -0400 |
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
- Re: [PATCH v3 09/13] tests/vm: upgrade Ubuntu 18.04 VM to 20.04, (continued)