qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-block@nongnu.org, qemu-devel@nongnu.org
Cc: vsementsov@virtuozzo.com, Markus Armbruster <armbru@redhat.com>,
	eblake@redhat.com, Max Reitz <mreitz@redhat.com>,
	Kevin Wolf <kwolf@redhat.com>, John Snow <jsnow@redhat.com>
Subject: [Qemu-devel] [PATCH v3 4/7] iotests.py: don't abort if IMGKEYSECRET is undefined
Date: Fri, 14 Dec 2018 18:15:09 -0500	[thread overview]
Message-ID: <20181214231512.5295-5-jsnow@redhat.com> (raw)
In-Reply-To: <20181214231512.5295-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>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.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

  parent reply	other threads:[~2018-12-14 23:15 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-14 23:15 [Qemu-devel] [PATCH v3 0/7] bitmaps: remove x- prefix from QMP api John Snow
2018-12-14 23:15 ` [Qemu-devel] [PATCH v3 1/7] blockdev: abort transactions in reverse order John Snow
2018-12-14 23:15 ` [Qemu-devel] [PATCH v3 2/7] blockdev: n-ary bitmap merge John Snow
2018-12-14 23:15 ` [Qemu-devel] [PATCH v3 3/7] block: remove 'x' prefix from experimental bitmap APIs John Snow
2018-12-14 23:15 ` John Snow [this message]
2018-12-14 23:15 ` [Qemu-devel] [PATCH v3 6/7] iotests: allow pretty-print for qmp_log John Snow
2018-12-17 14:26   ` Vladimir Sementsov-Ogievskiy
2018-12-17 16:37     ` Vladimir Sementsov-Ogievskiy
2018-12-17 19:21       ` John Snow
2018-12-18  8:37         ` Vladimir Sementsov-Ogievskiy
2018-12-14 23:15 ` [Qemu-devel] [PATCH v3 7/7] iotests: add iotest 236 for testing bitmap merge John Snow
2018-12-17 15:48   ` Vladimir Sementsov-Ogievskiy
2018-12-17 21:32     ` John Snow
2018-12-18  8:45       ` Vladimir Sementsov-Ogievskiy
2018-12-18  9:20   ` Vladimir Sementsov-Ogievskiy
2018-12-14 23:32 ` [Qemu-devel] [PATCH v3 5/7 RESEND] iotests: add filter_generated_node_ids John Snow
     [not found] ` <20181214231512.5295-6-jsnow@redhat.com>
2018-12-17 14:37   ` [Qemu-devel] [PATCH v3 5/7] " Vladimir Sementsov-Ogievskiy
2018-12-17 21:14 ` [Qemu-devel] [PATCH v3 0/7] bitmaps: remove x- prefix from QMP api John Snow
2018-12-20  1:24   ` John Snow
2018-12-23 14:28 ` 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=20181214231512.5295-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).