[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 15/20] iotests/287: Clean up subshell test image
From: |
Max Reitz |
Subject: |
[PATCH v2 15/20] iotests/287: Clean up subshell test image |
Date: |
Tue, 22 Sep 2020 12:49:27 +0200 |
287 creates an image in a subshell (thanks to the pipe) to see whether
that is possible with compression_type=zstd. If _make_test_img were to
modify any global state, this global state would then be lost before we
could cleanup the image.
When using FUSE as the test protocol, this global state is important, so
clean up the image before the state is lost.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/287 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/287 b/tests/qemu-iotests/287
index f98a4cadc1..036cc09e82 100755
--- a/tests/qemu-iotests/287
+++ b/tests/qemu-iotests/287
@@ -51,8 +51,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
CLUSTER_SIZE=65536
# Check if we can run this test.
-if IMGOPTS='compression_type=zstd' _make_test_img 64M |
- grep "Invalid parameter 'zstd'"; then
+output=$(_make_test_img -o 'compression_type=zstd' 64M; _cleanup_test_img)
+if echo "$output" | grep -q "Invalid parameter 'zstd'"; then
_notrun "ZSTD is disabled"
fi
--
2.26.2
- [PATCH v2 02/20] fuse: Allow exporting BDSs via FUSE, (continued)
- [PATCH v2 02/20] fuse: Allow exporting BDSs via FUSE, Max Reitz, 2020/09/22
- [PATCH v2 05/20] fuse: (Partially) implement fallocate(), Max Reitz, 2020/09/22
- [PATCH v2 06/20] fuse: Implement hole detection through lseek, Max Reitz, 2020/09/22
- [PATCH v2 07/20] iotests: Do not needlessly filter _make_test_img, Max Reitz, 2020/09/22
- [PATCH v2 08/20] iotests: Do not pipe _make_test_img, Max Reitz, 2020/09/22
- [PATCH v2 09/20] iotests: Use convert -n in some cases, Max Reitz, 2020/09/22
- [PATCH v2 10/20] iotests/046: Avoid renaming images, Max Reitz, 2020/09/22
- [PATCH v2 11/20] iotests: Derive image names from $TEST_IMG, Max Reitz, 2020/09/22
- [PATCH v2 12/20] iotests/091: Use _cleanup_qemu instad of "wait", Max Reitz, 2020/09/22
- [PATCH v2 13/20] iotests: Restrict some Python tests to file, Max Reitz, 2020/09/22
- [PATCH v2 15/20] iotests/287: Clean up subshell test image,
Max Reitz <=
- [PATCH v2 16/20] storage-daemon: Call bdrv_close_all() on exit, Max Reitz, 2020/09/22
- [PATCH v2 14/20] iotests: Let _make_test_img guess $TEST_IMG_FILE, Max Reitz, 2020/09/22
- [PATCH v2 17/20] iotests: Give access to the qemu-storage-daemon, Max Reitz, 2020/09/22
- [PATCH v2 18/20] iotests: Allow testing FUSE exports, Max Reitz, 2020/09/22
- [PATCH v2 19/20] iotests: Enable fuse for many tests, Max Reitz, 2020/09/22
- [PATCH v2 20/20] iotests/308: Add test for FUSE exports, Max Reitz, 2020/09/22
- Re: [PATCH v2 00/20] block/export: Allow exporting BDSs via FUSE, Daniel P . Berrangé, 2020/09/22