All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org, qemu-block@nongnu.org
Cc: Eric Blake <eblake@redhat.com>,
	vsementsov@virtuozzo.com, Kevin Wolf <kwolf@redhat.com>,
	John Snow <jsnow@redhat.com>, Max Reitz <mreitz@redhat.com>,
	Fam Zheng <fam@euphon.net>, Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-devel] [PATCH v5 05/11] iotests.py: don't abort if IMGKEYSECRET is undefined
Date: Wed, 19 Dec 2018 21:29:46 -0500	[thread overview]
Message-ID: <20181220022952.20493-6-jsnow@redhat.com> (raw)
In-Reply-To: <20181220022952.20493-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>
Message-id: 20181214231512.5295-5-jsnow@redhat.com
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

  parent reply	other threads:[~2018-12-20  2:30 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-20  2:29 [Qemu-devel] [PATCH v5 00/11] bitmaps: remove x- prefix from QMP api John Snow
2018-12-20  2:29 ` [Qemu-devel] [PATCH v5 01/11] blockdev: abort transactions in reverse order John Snow
2018-12-20  2:29 ` [Qemu-devel] [PATCH v5 02/11] block/dirty-bitmap: remove assertion from restore John Snow
2018-12-20  2:41   ` Eric Blake
2018-12-20  8:33   ` Vladimir Sementsov-Ogievskiy
2018-12-20  2:29 ` [Qemu-devel] [PATCH v5 03/11] blockdev: n-ary bitmap merge John Snow
2018-12-20  2:48   ` Eric Blake
2018-12-20 21:03     ` John Snow
2018-12-20  9:23   ` Vladimir Sementsov-Ogievskiy
2018-12-20  2:29 ` [Qemu-devel] [PATCH v5 04/11] block: remove 'x' prefix from experimental bitmap APIs John Snow
2018-12-20  2:29 ` John Snow [this message]
2018-12-20  2:29 ` [Qemu-devel] [PATCH v5 06/11] iotests: add filter_generated_node_ids John Snow
2018-12-20  2:29 ` [Qemu-devel] [PATCH v5 07/11] iotests: add qmp recursive sorting function John Snow
2018-12-20  2:40   ` Eric Blake
2018-12-20  9:42   ` Vladimir Sementsov-Ogievskiy
2018-12-20  2:29 ` [Qemu-devel] [PATCH v5 08/11] iotests: remove default filters from qmp_log John Snow
2018-12-20  2:50   ` Eric Blake
2018-12-20  9:48   ` Vladimir Sementsov-Ogievskiy
2018-12-20  2:29 ` [Qemu-devel] [PATCH v5 09/11] iotests: change qmp_log filters to expect QMP objects only John Snow
2018-12-20  2:53   ` Eric Blake
2018-12-20 22:12     ` John Snow
2018-12-20 11:21   ` Vladimir Sementsov-Ogievskiy
2018-12-20 22:26     ` John Snow
2018-12-20  2:29 ` [Qemu-devel] [PATCH v5 10/11] iotests: implement pretty-print for log and qmp_log John Snow
2018-12-20  2:55   ` Eric Blake
2018-12-20 11:29   ` Vladimir Sementsov-Ogievskiy
2018-12-20  2:29 ` [Qemu-devel] [PATCH v5 11/11] iotests: add iotest 236 for testing bitmap merge John Snow
2018-12-20  3:02   ` Eric Blake
2018-12-20 20:58     ` John Snow
2018-12-20 12:12   ` Vladimir Sementsov-Ogievskiy
2018-12-20 20:53     ` John Snow

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=20181220022952.20493-6-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=fam@euphon.net \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.