From ffb202539710de98044f20d13bd05843ed1dc94b Mon Sep 17 00:00:00 2001 From: John Snow Date: Wed, 20 Mar 2019 16:16:18 +0100 Subject: [PATCH 020/163] iotests.py: don't abort if IMGKEYSECRET is undefined RH-Author: John Snow Message-id: <20190320161631.14841-7-jsnow@redhat.com> Patchwork-id: 84943 O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 06/19] iotests.py: don't abort if IMGKEYSECRET is undefined Bugzilla: 1668956 RH-Acked-by: Max Reitz RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Miroslav Rezanina 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 Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy Message-Id: <20181221093529.23855-6-jsnow@redhat.com> Signed-off-by: Eric Blake (cherry picked from commit 58ebcb65d8e38fd693bf1e58dd941a4d7a8dfdef) Signed-off-by: John Snow Signed-off-by: Miroslav Rezanina --- 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 1b9656a..c5739a6 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -61,7 +61,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' -- 1.8.3.1