On 05.09.20 13:24, 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 <th...@redhat.com> > --- > 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(+) > > 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..8c3af2f658 100755 > --- a/tests/qemu-iotests/030 > +++ b/tests/qemu-iotests/030 > @@ -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
signature.asc
Description: OpenPGP digital signature
