From nobody Tue Feb 10 21:19:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522423294101215.64037492129523; Fri, 30 Mar 2018 08:21:34 -0700 (PDT) Received: from localhost ([::1]:45636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1vqP-0000yE-84 for importer@patchew.org; Fri, 30 Mar 2018 11:21:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1vlt-0005Un-M8 for qemu-devel@nongnu.org; Fri, 30 Mar 2018 11:16:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1vlq-0006PP-NN for qemu-devel@nongnu.org; Fri, 30 Mar 2018 11:16:53 -0400 Received: from mail-db5eur01on0137.outbound.protection.outlook.com ([104.47.2.137]:31845 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f1vlq-0006Kq-GE; Fri, 30 Mar 2018 11:16:50 -0400 Received: from vova-pc.sw.ru (195.214.232.6) by DB6PR0801MB2054.eurprd08.prod.outlook.com (2603:10a6:4:77::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Fri, 30 Mar 2018 15:16:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6olzysU+B8zoMDsnJjo5KKhSDIYk7fnAI7O/2CvTkiU=; b=FH8aL8fhW8F7clDQmEnJI8hcC0Nx0ZuRihnCn3wAz3mdEERKUr2QLnJ3MiYncf97G7TLmVnVAsI4c9HG9UbWaHfDzHMJEHGqntVRu3bij6DFXIccAXMFc9YBlEEqvhET3lURqZT/pgnSBIJcLef7maHbgYifIVWV9DzYieQTd04= From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 30 Mar 2018 18:16:34 +0300 Message-Id: <1522422996-14235-2-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522422996-14235-1-git-send-email-vsementsov@virtuozzo.com> References: <1522422996-14235-1-git-send-email-vsementsov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0240.eurprd05.prod.outlook.com (2603:10a6:3:fb::16) To DB6PR0801MB2054.eurprd08.prod.outlook.com (2603:10a6:4:77::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f3a23d34-d7e0-465b-2e8a-08d596514075 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0801MB2054; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2054; 3:WSYh8mkTPGCHuQ5aKBeDejSXyC4m37mBJOaAANOfPsUJohgWh5f/YxSn3YSD6IM+G916X/EfqjevdWnJUQn/X035XdtnU9dnUTIrLTgyKce9GO0xvAPPD7n3NUilox0xEPk1Var0DSb1rPvScaevDiUMQ2IPGKhqKZAIT5hQw1ykPdOCQAopGVqJ107dGD96CXt0Fg+xS7AM5WLtIbrArMXRUbgEUDyEfaFljTOTuGM1RY6awaRSL11qd14Ajt6H; 25:f40wuKsUwtoqSwbKIyrxqxy5NaBgBZYXGKvb6J8eZtl3RUCIbGrlC49d8sv7wt+jgvsjVhxqzpoIgdFmjxnF4PmJ8EpE2Ytzew5yknpwJ8n60hdsSxJksrLNzQ8bjkryw2V8nn5nCyXPwmlWuLw4zdNqNRa3pyvyo/0Ij2m1Tl5KAmU0rq554FSs0orQt95VRC/SpWm3uny62hb+fzsb+oXsQE7nK64bTJwv1GH3ebAMHY9sHRwFVOolkqfgrE1nLTdQETCdxlLr9SYqEcyHRn4dlEk5rJDfc/Sv99SraIqUn19HvVSwtWCwsmyBUdEq6Mc6RYpFD2GRu2sAfcXP0w==; 31:7qZ/v/ZTxaNjnS92jvrOTzpI4SLlZINXnUD7RS49lerFfM936TD6rd0s0goPoaNcquSxRUYK8WlNaDNErxqSIkNWEGcBS1uFZ1hXu0HoJ6WEH8LjFiDsELfYN72CkwbU11uxZVmeizlb4l7lVoGV3jFvYf0ePoszDqE3SS8X/sOj2aOM77I/kH7DNqTsG3Z3hlFTgnbkpsjXnpgwKymqOz+GCHA/F9sXsQY2BLezxm4= X-MS-TrafficTypeDiagnostic: DB6PR0801MB2054: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2054; 20:o6Ot9DgyrTrmv2DX3P1UNc0m0anMXLxiB1YqKXKS5gXsM09hNjAbRklflJ/oeTqJBh+RnSjYPqFiONKRgo4qE10Yy87/8FRGAZnJT3A6JmoqSsrn9RLyfx2VZ2DhQ1fZ2wEvCweyvaQ2L6+CTx8I+fIP74fmu7Qpx19K5Sl5kiuGOwwHOCAAWGMA4EKoC2m7sa+uu5DgFOwDehfeRSuWj195faQ+16aMoTa+g487jzO+3eSnBLoqWaTqtkPlV7tLYjbmpzk0sdcF57tAvWTh7G7f0U47GxcxUGFvxC723pDQ+n5gmgUzWF4FLbdtghBgh1v9FOvgT8qhU6LrW0QnM1HG+RSXaA3y/mSSKtpTQNAQFxp2NjPAr3tPUjhBX2oR7yjE3DPCaCfbY/2pwVInhVBy6mroCn4l4uCP3Uw5TndJLfOZxKlEJZwLPGw/2/UtFKDAxokcDkgOrPNs8cvDE+aczyyqqyoOcFUFCqmbk98xhWgS9KiRSx8yBVYllzbe; 4:u5eqE1OxfzPqryNwnnoDPd8BA0dwzBk2/LG3F0gRdBPEs42TaRN9Z9Sh30/UmafkLeXPoOuWK6mNq1Y8mzlpQnnmXMti7f75KxDst904S5HeKh7fakLnqarv/JQkLZRdCpCFc3HGg8gJiEmowLhjRp/qY5qzh/UQeuVRz5lvEtIjeKyjRQ8N0FX0eD3BxE39Ovj90yMo4YhCujD4inLjr1ELWRuYFl+sD39pSfsUDovlE0SzI2RZZFkYUEl1Licp3oqm3gbigA9gNbxYRVNPBg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(10201501046)(93006095)(93001095)(6041310)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DB6PR0801MB2054; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0801MB2054; X-Forefront-PRVS: 06274D1C43 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39840400004)(39380400002)(376002)(346002)(396003)(189003)(199004)(386003)(6506007)(305945005)(7736002)(53416004)(97736004)(50226002)(59450400001)(106356001)(81156014)(66066001)(47776003)(4326008)(52116002)(81166006)(76176011)(105586002)(6346003)(3846002)(69596002)(6116002)(8936002)(8676002)(51416003)(55236004)(50466002)(6666003)(446003)(11346002)(476003)(48376002)(15650500001)(107886003)(316002)(2906002)(956004)(26005)(486005)(16526019)(186003)(36756003)(86362001)(6512007)(478600001)(2616005)(25786009)(53936002)(16586007)(486005)(5660300001)(6486002)(68736007)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0801MB2054; H:vova-pc.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0801MB2054; 23:ErtoYvCHfoO85HJH+RcNwYte9+iuLGhzL5rpEsc?= =?us-ascii?Q?SHHRPbAAYH+ecjGvLeiBeaU3OVErGGlTFahWbH5k8/z5Yl0TzyIo1cDbHtUg?= =?us-ascii?Q?1UX8+/5eUjv6GRjdyjvowBg3BhmgkXaRbOLnd/1e6x/zE43Klf+61QdlF1jK?= =?us-ascii?Q?nKg0tIdY9D5tc+gaMGHOuTWm2wlaE9fkW+Tuu1JzkhmdlH9QDsBAq3SIRzl9?= =?us-ascii?Q?4kYMVH+ztFRTUalFjA2tjRwzMOGUmuMP+U1PBfS7hoS7rBji4vR39700uMul?= =?us-ascii?Q?ldMypMcTSSHJRxR2JUPkG59Qzi53CGSytJlYlD9AALLRPZYkVywdFHEzRy+a?= =?us-ascii?Q?EG82V/GnvWm3vlhOnPBfbaumqy6p+LvJBVn+ew/wTUqshtw711fED2cC7wxm?= =?us-ascii?Q?SRKarP0z/ctp8HxEpNevlashiM3TLPhXCxStdP/dtJJgYI4Os72K6IaSLQSC?= =?us-ascii?Q?ocPPQCwHgSBmPJyDBBsgmPT9W+CtQ+Nlle5BcRnJveFjLc9aOfrGi/Koe88z?= =?us-ascii?Q?V44vyYIGPHkAhlkp/98gx1jSRSI+maD1tyeUiCW0hzy4g2CMkISyAf6+snfZ?= =?us-ascii?Q?buRGHwMXyjRb9qYAtaKHPITW2N0FHK+r4e8OCzZvDaluJzefzwvVumsQNpbU?= =?us-ascii?Q?tT0zwySpG16X8rtY8zdoeX4nWpvNeCaxPy/eHixgFW+4zsLfykEciYtIgiRd?= =?us-ascii?Q?dCByRYo7ly+W9OuH3Qe3r4df1/r7OSRDEiKDbKZhz4oRvEAnKMidkRCLLEM8?= =?us-ascii?Q?o8gFH8HSMpDcvYOvXIovAk/aVds6XLGMNr9WaUprr8UxdS5EAJA158q8/E3n?= =?us-ascii?Q?HSQvK5H1sBn6r/W2nXKo93r3gKjAFEKRIDqJhHnxw/nAGjyk7xiXlwWFDNfM?= =?us-ascii?Q?AKRfTbEn+BHOSRTic2cVTZKhVhigQGuWAGI7itHqkDRgXUuMoBE1Z7NeCok2?= =?us-ascii?Q?13dFf1Zp2NuoMWIDnS9XXMA99WvIn/4ES1O3RCoNcqZOE517JuE9KDTLTUhu?= =?us-ascii?Q?652h6/2po4IUn/Lyr7+jeZOyL26PoS0yqZ1tEp3+2lJbPiVDAqtXQQBXZLR0?= =?us-ascii?Q?3wphoLCjwf+7h7RWg+Yw9If9kNWNvhErw8UOSS3gEQFYybU5msC/Sgw9HIL7?= =?us-ascii?Q?awsm3gOfQ0Qr5uqyVJrYQ9TSmz5+EpHoJG5dbcIWR+wATIvYZdJ7Bk1156qs?= =?us-ascii?Q?E8S/fDVrvJ3+EjaaojQqyVfJmJCfgXqfOsRjovCutvCzzbsiPgorRssJFUYK?= =?us-ascii?Q?f36ucLKWHdUZB3naUA/D5eOdLw+d2xUsZGc+30D7nf/503joGiwp02SmwMOg?= =?us-ascii?Q?vg9AVFJAcK4/KDVtSRVVUGOhCtrwNoz+GnDLXkEu6Nd9BcPbhoB3qizGrpJf?= =?us-ascii?Q?LXYlMZw=3D=3D?= X-Microsoft-Antispam-Message-Info: M8Vmgqa9hT4rxWIhZKgw3CbFTjwgmAlYRfxJOENrgXF3C4MYpOgJkzakKcKmGmJVarB6okUCM+m6ZGi01vXJQEnsvbMoF6clvav2st8MGFT8KW81HH83hh8gxdaUvyZQPi4Qhy3nwNNRFNRI9CX05rFpVsf4Lbq/7fYBhcBKTi2i+oMHrKB86yRt6Ys5V4O+ X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2054; 6:ccefDa1iCM41r/z/eHJPbZOzSwdZeEV6u0Iya+4JOm3ZaowsGpRKxrbi7dRd5j0Lslh0x9xJzwbRNlsx5VwPt7BT3NLlqAQIGX5WCClh3x+CsfgQrir7XrLfzSsHe+GtZtojicgjDj4sAWqSiY1XqzFzgs1XIzZunjYth7sVLC3T2cB5tzED97ZARkGj0VwlsaHNRngtetibyHEibqAf+HVwyj/MSIPlEDu1C1mfKHGQaii+Bq+FE/XUWXJRNFgANXqlDxmcp+kCeGcs3K7m0dgwWJeSFwBI6ceSL2UlzcaRYrHBwYhRpiCtr0k/MzlgjNq0LF5vwYceJuUsRNZjjgQ31WbHg1S85+WlXZJxsTm1L8yNY+RFOO8R18Ki76qbbdFOWqIhhOBp9VSPHH+k255DblPeZFukP1flfM70igzS7pGs5zZVdvr+C4H/xWdA4rTy1kbr+Ik5uxiahPYldg==; 5:ubkGPbaAE9KinfJCw1HDgO+CRN5E6kGKQSsU5pM2q39Oa6rQ2GnkHBUEt0cyB5eHVNOiaH6IpL52DTHcd2QTTDAi+OpJVBsKFpFmO8mjWfbcwn5eoLj3qONEqxsXOTVeqDQwOQIxPkwB727yOt8fTAzVlFAEMbsQBesnvowzgTs=; 24:AyqJBaR7odH08Ldt3rH8rDvKJ9tb3vp+o/UnTwomUK/7Sk+9Hvnx7Tg5T9zwA/Sz1GB9mDsLdsdvj4VORyorh5n6pxmtGcsX9nkQ5ToagNI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2054; 7:szio8oN1RN0OjRf5WYmszheCAWaJxg+1S0nT3HQ7kxmEUpFiEMafsAuCd9yMkW1zoIk9+NIT/KjgXDrPZ6+nwj54ZT0HvG3EWp65H7QCa4rgk18ZLLu4rZwcrNdOAaLjvgMjt3LKTDEaS9MwxsRrkrUHAwzHIE8NVxQZoeIeeX8ogs79vkrTrHp7Fznw53ggcbeu5u/v83AY5EfQt4btCZ7SHQlG0OY+/g7yemz44gLXYYLVLH6zYpiQAGnabNpB; 20:f3V+olRdTKXPc/j9a8L0yi3eCAWHisaopTImR5zf4zIvHVcBts02hEd60Je8lUa9o9PdFDKJhZkLtZT/GnBQXXqc0I5FOixqNSQ5qh+bP/UTFddHdh93XJd9f3VJbussjlHAHs8dHB4Pey2eina98vIPt9KyX14h7X8875M+MOo= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2018 15:16:45.2294 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f3a23d34-d7e0-465b-2e8a-08d596514075 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB2054 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.137 Subject: [Qemu-devel] [PATCH 1/3] iotests.py: improve verify_image_format helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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) =20 def verify_image_format(supported_fmts=3D[], unsupported_fmts=3D[]): - 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 =3D 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) =20 def verify_platform(supported_oses=3D['linux']): --=20 2.7.4