[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 4/7] iotests.py: don't abort if IMGKEYSECRET is u
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH v2 4/7] iotests.py: don't abort if IMGKEYSECRET is undefined |
Date: |
Wed, 12 Dec 2018 20:50:10 -0500 |
Instead of using os.environ[], use .get with a default of empty string
to match the setup in check to allow us to import the iotests module
(for debugging, say) without needing a crafted environment just to
import the module.
Signed-off-by: John Snow <address@hidden>
---
tests/qemu-iotests/iotests.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index d537538ba0..a34e66813a 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -63,7 +63,7 @@ socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER',
'socket_scm_helper')
debug = False
luks_default_secret_object = 'secret,id=keysec0,data=' + \
- os.environ['IMGKEYSECRET']
+ os.environ.get('IMGKEYSECRET', '')
luks_default_key_secret_opt = 'key-secret=keysec0'
--
2.17.2
- Re: [Qemu-block] [PATCH v2 6/7] iotests: allow pretty-print for qmp_log, (continued)
[Qemu-block] [PATCH v2 1/7] blockdev: abort transactions in reverse order, John Snow, 2018/12/12
[Qemu-block] [PATCH v2 2/7] blockdev: n-ary bitmap merge, John Snow, 2018/12/12
[Qemu-block] [PATCH v2 3/7] block: remove 'x' prefix from experimental bitmap APIs, John Snow, 2018/12/12
[Qemu-block] [PATCH v2 4/7] iotests.py: don't abort if IMGKEYSECRET is undefined,
John Snow <=
[Qemu-block] [PATCH v2 5/7] iotests: add filter_generated_node_ids, John Snow, 2018/12/12
[Qemu-block] [PATCH v2 7/7] iotests: add iotest 236 for testing bitmap merge, John Snow, 2018/12/12