| Message ID | 20200907113824.134788-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] iotests: Skip test_stream_parallel in test 030 when doing "make check" | expand |
On 07.09.20 13:38, Thomas Huth wrote: > 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. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > v2: Use @unittest.skipIf() decorator > > tests/check-block.sh | 3 +++ > tests/qemu-iotests/030 | 2 ++ > 2 files changed, 5 insertions(+) Thanks :) Applied to my block branch: https://git.xanclic.moe/XanClic/qemu/commits/branch/block Max
diff --git a/tests/check-block.sh b/tests/check-block.sh index 8e29c868e5..a5a69060e1 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -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 diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 31c028306b..dcb4b5d6a6 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -21,6 +21,7 @@ import time import os import iotests +import unittest from iotests import qemu_img, qemu_io backing_img = os.path.join(iotests.test_dir, 'backing.img') @@ -228,6 +229,7 @@ class TestParallelOps(iotests.QMPTestCase): # Test that it's possible to run several block-stream operations # in parallel in the same snapshot chain + @unittest.skipIf(os.environ.get('QEMU_CHECK_BLOCK_AUTO'), 'disabled in CI') def test_stream_parallel(self): self.assert_no_active_block_jobs()
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. Signed-off-by: Thomas Huth <thuth@redhat.com> --- v2: Use @unittest.skipIf() decorator tests/check-block.sh | 3 +++ tests/qemu-iotests/030 | 2 ++ 2 files changed, 5 insertions(+)