iotests: Skip test_stream_parallel in test 030 when doing "make check"
PATCH 1/1 iotests: Skip test_stream_parallel in test 030 when doing "make check"
The test_stream_parallel test still occasionally fails in the CI. Thus let's disable it during "make check" for now so that it does not cause trouble during merge tests. We can enable it again once the problem has been resolved.
---
See e.g. these URLs for the failure:
https://cirrus-ci.com/task/5449330930745344?command=main#L6482
https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg00136.html
tests/check-block.sh | 3 +++ tests/qemu-iotests/030 | 4 ++++ 2 files changed, 7 insertions(+)
tests/check-block.sh +3 -0
@@ -55,6 +55,9 @@ fi cd tests/qemu-iotests +# QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests +export QEMU_CHECK_BLOCK_AUTO=1 + ret=0 for fmt in $format_list ; do ./check -makecheck -$fmt $group || ret=1
tests/qemu-iotests/030 +4 -0
@@ -231,6 +231,10 @@ class TestParallelOps(iotests.QMPTestCase): def test_stream_parallel(self): self.assert_no_active_block_jobs() + # The test occasionally failed in the CI, so disable it for "make check": + if os.environ.get('QEMU_CHECK_BLOCK_AUTO'): + return + # Check that the maps don't match before the streaming operations for i in range(2, self.num_imgs, 2): self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', self.imgs[i]),
Signature · 1 line
2.18.2
Quoted 34 lines · Thomas Huth
The
test_stream_paralleltest still occasionally fails in the CI. Thus let's disable it during "make check" for now so that it does not cause trouble during merge tests. We can enable it again once the problem has been resolved.Signed-off-by Thomas Huth <[email protected]>---
See e.g. these URLs for the failure:
https://cirrus-ci.com/task/5449330930745344?command=main#L6482
https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg00136.htmltests/check-block.sh | 3 +++ tests/qemu-iotests/030 | 4 ++++ 2 files changed, 7 insertions(+)tests/check-block.sh +3
-0@@ -55,6 +55,9 @@ fi cd tests/qemu-iotests +# QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests +export QEMU_CHECK_BLOCK_AUTO=1 + ret=0 for fmt in $format_list ; do ./check -makecheck -$fmt $group || ret=1tests/qemu-iotests/030 +0
-0
tests/qemu-iotests/030 class TestParallelOps(iotests.QMPTestCase): · line 236
Quoted 6 lines
tests/qemu-iotests/030 +3
-0@@ -231,6 +231,10 @@ class TestParallelOps(iotests.QMPTestCase): def test_stream_parallel(self): self.assert_no_active_block_jobs() + # The test occasionally failed in the CI, so disable it for "make check": + if os.environ.get('QEMU_CHECK_BLOCK_AUTO'): + return
What do you think about a decorator, i.e.
@unittest.skipIf(os.environ.get('QEMU_CHECK_BLOCK_AUTO'),
'test disabled in CI')
?
Max