iotests: Check whether luks works

Whenever running an iotest for the luks format, we should check whether
luks actually really works.

Tests that try to create luks-encrypted qcow2 images should do the same.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200625125548.870061-7-mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>

diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087
index bdfdad3454e3b5e1f950f4bc55baff58210a817e..678e748c58c737de8d035c8d2ed7d5bcc375e027 100755 (executable)
--- a/tests/qemu-iotests/087
+++ b/tests/qemu-iotests/087
@@ -39,6 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
+_require_working_luks
 
 do_run_qemu()
 {

diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
index 7cf0e27154d0eee81cf29a1e4382ac301129b3f1..f09b27caacf3eeef0b9d66ce4792f31c9118d675 100755 (executable)
--- a/tests/qemu-iotests/178
+++ b/tests/qemu-iotests/178
@@ -41,6 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt raw qcow2
 _supported_proto file
 _supported_os Linux
+_require_working_luks
 
 echo "== Input validation =="
 echo

diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188
index 09b9b6083ab3eab9b9b5f3c051a4877489df0dc6..13b225fded475eb18527af5f1d1c21a56f70bf8a 100755 (executable)
--- a/tests/qemu-iotests/188
+++ b/tests/qemu-iotests/188
@@ -39,6 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _supported_os Linux
+_require_working_luks
 
 
 size=16M

diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189
index c9ce9d3bede3038e367019cea18d73cbf9549c4b..e6a84b8a3b2227a425b4b0859b7803ebb508ef5e 100755 (executable)
--- a/tests/qemu-iotests/189
+++ b/tests/qemu-iotests/189
@@ -39,6 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _supported_os Linux
+_require_working_luks
 
 
 size=16M

diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
index fb0d5a29d357d1b46e2e83ee1c41eaa8c5e6b425..aeb059d5ea68db762b23b39f0c47a271c359d284 100755 (executable)
--- a/tests/qemu-iotests/198
+++ b/tests/qemu-iotests/198
@@ -39,6 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _supported_os Linux
+_require_working_luks
 
 
 size=16M

diff --git a/tests/qemu-iotests/206 b/tests/qemu-iotests/206
index f42432a8388586951b7b2e34454c268d4af7dd9e..11bc51f25602c081462898edc8213602af39db9e 100755 (executable)
--- a/tests/qemu-iotests/206
+++ b/tests/qemu-iotests/206
@@ -24,6 +24,7 @@ import iotests
 from iotests import imgfmt
 
 iotests.script_initialize(supported_fmts=['qcow2'])
+iotests.verify_working_luks()
 
 with iotests.FilePath('t.qcow2') as disk_path, \
      iotests.FilePath('t.qcow2.base') as backing_path, \

diff --git a/tests/qemu-iotests/263 b/tests/qemu-iotests/263
index d2c030fae95f29a58b888c4b1bba8684a2485110..f598a128997453f0a7f1261e2059e12c458d70dc 100755 (executable)
--- a/tests/qemu-iotests/263
+++ b/tests/qemu-iotests/263
@@ -40,6 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _supported_os Linux
+_require_working_luks
 
 
 size=1M

diff --git a/tests/qemu-iotests/284 b/tests/qemu-iotests/284
index 071e89b33e488a1064e3b870914f48e5082f108e..9f6c29a79c5a597d90c64f719c51e6b3716f64bf 100755 (executable)
--- a/tests/qemu-iotests/284
+++ b/tests/qemu-iotests/284
@@ -39,6 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto generic
 _supported_os Linux
+_require_working_luks
 
 
 size=1M

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index f3667f48ab68bf51757642891730f582ae87c424..7ac46edc1f9e8f5a64dcfcf451227db00d82b838 100644 (file)
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -605,6 +605,9 @@ _supported_fmt()
     # setting IMGFMT_GENERIC to false.
     for f; do
         if [ "$f" = "$IMGFMT" -o "$f" = "generic" -a "$IMGFMT_GENERIC" = "true" ]; then
+            if [ "$IMGFMT" = "luks" ]; then
+                _require_working_luks
+            fi
             return
         fi
     done

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 1d8a45c02e670b571746383483125e20201539ae..f1e0733dda0548b488c087628584fc1ed4c14833 100644 (file)
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -1010,12 +1010,17 @@ def _verify_image_format(supported_fmts: Sequence[str] = (),
         # similar to
         #   _supported_fmt generic
         # for bash tests
+        if imgfmt == 'luks':
+            verify_working_luks()
         return
 
     not_sup = supported_fmts and (imgfmt not in supported_fmts)
     if not_sup or (imgfmt in unsupported_fmts):
         notrun('not suitable for this image format: %s' % imgfmt)
 
+    if imgfmt == 'luks':
+        verify_working_luks()
+
 def _verify_protocol(supported: Sequence[str] = (),
                      unsupported: Sequence[str] = ()) -> None:
     assert not (supported and unsupported)