Skip to contentSkip to conversation

iotests: remove LUKS support from test 226

PATCH Superseded John Snow 2 participants 3 messages Jul 12, 2018 – Jul 13, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

John Snow

author
#0 lore raw

PATCH 1/1 iotests: remove LUKS support from test 226

This test doesn't actually care about the format anyway, it just supports "all formats" as a convenience. LUKS however does not use a simple image filename which confuses this iotest.

We can simply remove the LUKS "support" and be happier for it.

---
 tests/qemu-iotests/226 | 2 ++
 1 file changed, 2 insertions(+)
tests/qemu-iotests/226 +2 -0
index 460aea2fc9..ebfaf62e53 100755
@@ -40,7 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.pattern
 
 # Generic format, but tests file-protocol specific error handling
+# LUKS does not use a simple filename; this test doesn't use the format anyway.
 _supported_fmt generic
+_unsupported_fmt luks
 _supported_proto file
 _supported_os Linux
 
Signature · 1 line
2.14.4
#1 lore raw

Am 13.07.2018 um 00:12 hat John Snow geschrieben:

Quoted 16 lines

This test doesn't actually care about the format anyway, it just supports "all formats" as a convenience. LUKS however does not use a simple image filename which confuses this iotest.

We can simply remove the LUKS "support" and be happier for it.

---
 tests/qemu-iotests/226 | 2 ++
 1 file changed, 2 insertions(+)
tests/qemu-iotests/226 +0 -0
index 460aea2fc9..ebfaf62e53 100755

tests/qemu-iotests/226 trap "_cleanup; exit \$status" 0 1 2 3 15 · line 47

Quoted 8 lines
tests/qemu-iotests/226 +2 -0
@@ -40,7 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.pattern
 
 # Generic format, but tests file-protocol specific error handling
+# LUKS does not use a simple filename; this test doesn't use the format anyway.
 _supported_fmt generic
+_unsupported_fmt luks
 _supported_proto file
 _supported_os Linux

Maybe it would be better to test for $IMGOPTSSYNTAX = "true", because that's the real problem here?

Kevin

author
#2 lore raw
Quoted 29 lines · Kevin Wolf

Am 13.07.2018 um 00:12 hat John Snow geschrieben:

Quoted 16 lines

This test doesn't actually care about the format anyway, it just supports "all formats" as a convenience. LUKS however does not use a simple image filename which confuses this iotest.

We can simply remove the LUKS "support" and be happier for it.

---
 tests/qemu-iotests/226 | 2 ++
 1 file changed, 2 insertions(+)
tests/qemu-iotests/226 +0 -0
index 460aea2fc9..ebfaf62e53 100755

tests/qemu-iotests/226 trap "_cleanup; exit \$status" 0 1 2 3 15 · line 47

Quoted 8 lines
tests/qemu-iotests/226 +2 -0
@@ -40,7 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.pattern
 
 # Generic format, but tests file-protocol specific error handling
+# LUKS does not use a simple filename; this test doesn't use the format anyway.
 _supported_fmt generic
+_unsupported_fmt luks
 _supported_proto file
 _supported_os Linux

Maybe it would be better to test for $IMGOPTSSYNTAX = "true", because that's the real problem here?

Quoted 2 lines

Kevin

Oh, OK. I didn't know about that var.