From c0b65475ef503557d2c6a86447784923bab4824d Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Apr 15 2021 07:13:04 +0000 Subject: Add upstream patch to make iotests/qsd-jobs test stable on slow machines --- diff --git a/0001-iotests-qsd-jobs-Filter-events-in-the-first-test.patch b/0001-iotests-qsd-jobs-Filter-events-in-the-first-test.patch new file mode 100644 index 0000000..db569d2 --- /dev/null +++ b/0001-iotests-qsd-jobs-Filter-events-in-the-first-test.patch @@ -0,0 +1,66 @@ +From 66f18320f751f9649e0f230e814dd556e38bc1fe Mon Sep 17 00:00:00 2001 +From: Max Reitz +Date: Thu, 1 Apr 2021 15:28:39 +0200 +Subject: [PATCH] iotests/qsd-jobs: Filter events in the first test + +The job may or may not be ready before the 'quit' is issued. Whether it +is is irrelevant; for the purpose of the test, it only needs to still be +there. Filter the job status change and READY events from the output so +it becomes reliable. + +Reported-by: Peter Maydell +Suggested-by: Vladimir Sementsov-Ogievskiy +Signed-off-by: Max Reitz +Message-Id: <20210401132839.139939-1-mreitz@redhat.com> +Reviewed-by: Vladimir Sementsov-Ogievskiy +Signed-off-by: Kevin Wolf +--- + tests/qemu-iotests/tests/qsd-jobs | 5 ++++- + tests/qemu-iotests/tests/qsd-jobs.out | 10 ---------- + 2 files changed, 4 insertions(+), 11 deletions(-) + +diff --git a/tests/qemu-iotests/tests/qsd-jobs b/tests/qemu-iotests/tests/qsd-jobs +index 972b6b3898..510bf0a9dc 100755 +--- a/tests/qemu-iotests/tests/qsd-jobs ++++ b/tests/qemu-iotests/tests/qsd-jobs +@@ -52,9 +52,12 @@ echo "=== Job still present at shutdown ===" + echo + + # Just make sure that this doesn't crash ++# (Filter job status and READY events, because their order may differ ++# between runs, particularly around when 'quit' is issued) + $QSD --chardev stdio,id=stdio --monitor chardev=stdio \ + --blockdev node-name=file0,driver=file,filename="$TEST_IMG" \ +- --blockdev node-name=fmt0,driver=qcow2,file=file0 <