From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3MOu-0005yH-8f for qemu-devel@nongnu.org; Tue, 03 Apr 2018 09:55:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3MOt-0000N5-Fv for qemu-devel@nongnu.org; Tue, 03 Apr 2018 09:55:04 -0400 Date: Tue, 3 Apr 2018 15:54:58 +0200 From: Kevin Wolf Message-ID: <20180403135458.GD11070@localhost.localdomain> References: <1522422996-14235-1-git-send-email-vsementsov@virtuozzo.com> <1522422996-14235-2-git-send-email-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1522422996-14235-2-git-send-email-vsementsov@virtuozzo.com> Subject: Re: [Qemu-devel] [PATCH 1/3] iotests.py: improve verify_image_format helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladimir Sementsov-Ogievskiy Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, mreitz@redhat.com, jsnow@redhat.com, eblake@redhat.com, stefanha@redhat.com, den@openvz.org Am 30.03.2018 um 17:16 hat Vladimir Sementsov-Ogievskiy geschrieben: > Add an assert (we don't want set both arguments) and remove > duplication. > > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > tests/qemu-iotests/iotests.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index b5d7945..83c454d 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -532,9 +532,9 @@ def notrun(reason): > sys.exit(0) > > def verify_image_format(supported_fmts=[], unsupported_fmts=[]): > - if supported_fmts and (imgfmt not in supported_fmts): > - notrun('not suitable for this image format: %s' % imgfmt) > - if unsupported_fmts and (imgfmt in unsupported_fmts): > + assert not (supported_fmts and unsupported_fmts) > + not_sup = supported_fmts and (imgfmt not in supported_fmts) > + if not_sup or (imgfmt in unsupported_fmts): > notrun('not suitable for this image format: %s' % imgfmt) Before the change, we accepted None for both parameters. Now None is still accepted for supported_fmts, but not for unsupported_fmts any more. I don't think we actually make use of None for either, so I don't really mind whether we allow it or not, but we should be consistent between both parameters. Kevin