SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iotests: fix copy-before-write for macOS and FreeBSD

Browse Source 
strerror() represents ETIMEDOUT a bit different in Linux and macOS /
FreeBSD. Let's support the latter too.

Fixes: 9d05a87b77 ("iotests: copy-before-write: add cases for cbw-timeout option")
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Tested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220705153708.186418-1-vsementsov@yandex-team.ru>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2022-07-05 18:37:08 +03:00 committed by Richard Henderson
parent f085ba292b
commit 05b47eec90
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/qemu-iotests/tests/copy-before-write
View File

@ -192,6 +192,11 @@ read 1048576/1048576 bytes at offset 0
def test_timeout_break_guest(self): def test_timeout_break_guest(self):
log = self.do_cbw_timeout('break-guest-write') 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, """\ self.assertEqual(log, """\
wrote 524288/524288 bytes at offset 0 wrote 524288/524288 bytes at offset 0
512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)