From: John Snow <jsnow@redhat.com>
To: qemu-block@nongnu.org, qemu-devel@nongnu.org
Cc: Max Reitz <mreitz@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Markus Armbruster <armbru@redhat.com>,
eblake@redhat.com, Kevin Wolf <kwolf@redhat.com>,
John Snow <jsnow@redhat.com>
Subject: [Qemu-devel] [PATCH v2 4/7] iotests.py: don't abort if IMGKEYSECRET is undefined
Date: Wed, 12 Dec 2018 20:50:10 -0500 [thread overview]
Message-ID: <20181213015013.15350-5-jsnow@redhat.com> (raw)
In-Reply-To: <20181213015013.15350-1-jsnow@redhat.com>
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 <jsnow@redhat.com>
---
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
next prev parent reply other threads:[~2018-12-13 1:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 1:50 [Qemu-devel] [PATCH v2 0/7] bitmaps: remove x- prefix from QMP api John Snow
2018-12-13 1:50 ` [Qemu-devel] [PATCH v2 1/7] blockdev: abort transactions in reverse order John Snow
2018-12-13 1:50 ` [Qemu-devel] [PATCH v2 2/7] blockdev: n-ary bitmap merge John Snow
2018-12-13 12:25 ` Vladimir Sementsov-Ogievskiy
2018-12-13 1:50 ` [Qemu-devel] [PATCH v2 3/7] block: remove 'x' prefix from experimental bitmap APIs John Snow
2018-12-13 12:39 ` Vladimir Sementsov-Ogievskiy
2018-12-13 1:50 ` John Snow [this message]
2018-12-13 2:16 ` [Qemu-devel] [PATCH v2 4/7] iotests.py: don't abort if IMGKEYSECRET is undefined Eric Blake
2018-12-13 12:42 ` Vladimir Sementsov-Ogievskiy
2018-12-13 1:50 ` [Qemu-devel] [PATCH v2 5/7] iotests: add filter_generated_node_ids John Snow
2018-12-13 2:16 ` Eric Blake
2018-12-13 12:45 ` Vladimir Sementsov-Ogievskiy
2018-12-13 1:50 ` [Qemu-devel] [PATCH v2 6/7] iotests: allow pretty-print for qmp_log John Snow
2018-12-13 2:20 ` Eric Blake
2018-12-13 18:26 ` John Snow
2018-12-13 13:09 ` Vladimir Sementsov-Ogievskiy
2018-12-14 20:51 ` John Snow
2018-12-17 9:15 ` Vladimir Sementsov-Ogievskiy
2018-12-13 1:50 ` [Qemu-devel] [PATCH v2 7/7] iotests: add iotest 236 for testing bitmap merge John Snow
2018-12-13 2:27 ` Eric Blake
2018-12-13 18:28 ` John Snow
2018-12-13 13:50 ` Vladimir Sementsov-Ogievskiy
2018-12-13 18:38 ` John Snow
2018-12-13 6:19 ` [Qemu-devel] [PATCH v2 0/7] bitmaps: remove x- prefix from QMP api no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181213015013.15350-5-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).