diff options
| author | Thomas Huth <thuth@redhat.com> | 2020-09-07 13:38:24 +0200 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2020-09-15 11:05:13 +0200 |
| commit | 33fe08fcaf3773e2151bb60b4f9c62159a0c6633 (patch) | |
| tree | f5270229d5f9fb7a0f5d3cbaf53e6a7e7fdc6260 | |
| parent | c075c42f9bbde79d07bb680ad0d8aa20b5a387dc (diff) | |
| download | qemu-33fe08fcaf3773e2151bb60b4f9c62159a0c6633.zip qemu-33fe08fcaf3773e2151bb60b4f9c62159a0c6633.tar.gz qemu-33fe08fcaf3773e2151bb60b4f9c62159a0c6633.tar.bz2 | |
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.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20200907113824.134788-1-thuth@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rwxr-xr-x | tests/check-block.sh | 3 | ||||
| -rwxr-xr-x | tests/qemu-iotests/030 | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/check-block.sh b/tests/check-block.sh index 8e29c86..a5a6906 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 31c0283..dcb4b5d 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() |