From patchwork Thu Apr 26 16:19:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Kagan X-Patchwork-Id: 905208 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="chC/Orbu"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40X2T71yGGz9s08 for ; Fri, 27 Apr 2018 02:24:27 +1000 (AEST) Received: from localhost ([::1]:43329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBjh3-0005zz-AR for incoming@patchwork.ozlabs.org; Thu, 26 Apr 2018 12:24:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBjd6-0003Bl-3g for qemu-devel@nongnu.org; Thu, 26 Apr 2018 12:20:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBjd4-0000e6-Hq for qemu-devel@nongnu.org; Thu, 26 Apr 2018 12:20:19 -0400 Received: from mail-he1eur01on0132.outbound.protection.outlook.com ([104.47.0.132]:43469 helo=EUR01-HE1-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 1fBjcy-0000VC-28; Thu, 26 Apr 2018 12:20:12 -0400 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=kblFDboqkx5cRIQ+VpHE2RWfFLGJK+b3Lzm7Wu2aDsY=; b=chC/OrbuPVi4ybtdSbUVemMnbOkoIxSEo/mcQ2ug2uG2wSnYBl1MJBTT83EnykRt9RSyCjAJPdCgrBqu8LxcqeI14j/MlSMST5Sje9lIHbzzgdbHBB64+EYJUKbVM7FgP0tlOXp/PpgeTnVBZtYa3QmJzohoyNQTuO3kxtB6Sqg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rkagan@virtuozzo.com; Received: from rkaganb.sw.ru (195.214.232.6) by HE1PR0801MB1980.eurprd08.prod.outlook.com (2603:10a6:3:4f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.696.15; Thu, 26 Apr 2018 16:20:08 +0000 From: Roman Kagan To: Kevin Wolf , Max Reitz , Markus Armbruster , qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Thu, 26 Apr 2018 19:19:45 +0300 Message-Id: <20180426161958.2872-5-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180426161958.2872-1-rkagan@virtuozzo.com> References: <20180426161958.2872-1-rkagan@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0902CA0049.eurprd09.prod.outlook.com (2603:10a6:7:15::38) To HE1PR0801MB1980.eurprd08.prod.outlook.com (2603:10a6:3:4f::22) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR0801MB1980; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 3:MaYAI4LlpUh+vitwWnqw/u3i3xZk+4s+7Wyo4Gqmlj4bcQt2FtqqfPwqGx/fPH8Ezy+pxnseMSEM1ML2siMGnd92a63Dv5tuQQQSg6QWOfxZI5WhJWqGC9/iyL5hAWdBX2Ej/t7yVm07do9ktf80I47eCUxL9gfYO7un4ZUdeZInXwucOnhZfI0metUj3T7wLdTRFmyLiERfL2F/e/5k+SdDn2dO8I8OT2Eeskd2a8VE5DJFEkaY4wiH0CS8Gb9o; 25:wSg5A7jbT7QQiAx0OmfDw8NEs7hsuKjPz+RTpigXGDxxwQmKZfBvjJivFRdpsYXSQ0mLs+IRhWZMXRrPd//lqgtxJAidpwOKOH4D4QhRdcpiwSQR86dvWcMjOSP23/Bo23CKQHHbU9YB3T4xQmIUAwbZr+yh9wqzwddGKzN/DlMAqVshO1YX46fAUUf4FOkr+6wXOAuSFXuch23EmNKwQehRXdAu7hIUtEWW4WghF+2g0Azo/sbo3R3D056LOK5IwcF8D6xFZkM7Xr+nn9I+acfPZ49FrWv6Gm/tLSY2GbGzc3lhIwLwj+ExGpTT0tYdwCKpgdw0mjJRqGB5ixPtIw==; 31:5hOx2ksu5icDJugMlX6ezGgCfhRPK+cdfFOycuRKdlvUlY0jBXOZhoWWHejufH0OEkfrOqFpOEbL4UircUyzuCWwlJRkP9oy8mL+A6AfL/AM1xmXBmPPN2MoU7ZBPBQtI6XyMQ0XdKUxrx4VapfBJX7TUF9lafePWYkRTzg5xQmxz5hgP+PuO8hCVBx6HbukdZv07ompdY6AaR3Wws/HjNDgK18iyCGMJDaU+Gc+Bjk= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1980: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 20:eHy2/4rfrfrSpo3qhxZliVQToj4OBZV7VErSJnLbV3zCxV3oHr5TWNDLJEtoyx2yxPx3OZgM8/eCCh5INqqK9m5MkFUYnnXwSmgP47zgvtUXkuf9MRH403JsbE2ZuQpZ5EIarBZq+4S4pvF3mVX+fQAk7q6pU4VefjuxZIvYLTmDgGs4zueJFwFEfuZGHdtlaTBih6JJHateQrPgbbQLDKxzQTRIu+U8ntwj0S7U/H7rfNYeZIIiYKAxBPOS+SR+h+QNJ+VhAjvhJLwSWBXEKgSE2UAOAsA1RSHyIUr1lJeuMqFWU9wOtXKs0AP+fCB/0VkVT+bFDPXor5M1I1xKcpSU+ivx5B0cKj7fc0wQcFzOOOlDIV3yDMfXrKTZ1WpXLTwpQfYLtSu2OU2qPHXtSyvDSi7/TOCRVS1rTBMLcHpmDLI/K97cpmLF6AQEw4fjM7G0i44OhGat4sT7GtxTR4XhrR5fXGML+yFB8fhAaHx7lJPb1EN+gom5Qdwzxa66; 4:gFKDg/d7/X0fPyZUfbLefbZZLmUg+BSyQefBgP5FcAPw3axYjnHEKr5j2Rdsyptj/RuDN4BJ02I0bW1KiDQilzWrWUye9HEWxyE8bSwzydLwAZXi3rtx0cqlQZ11UsLq2ejBEsOMeqjQMFrMxnqW742RC5kjMOMkHrdc+ufQWnu8FN4nQ4hZvZnynJRcojXiZtQVJoJlAz9jnXlRUduTFppOZnnsipRGat3uhP6R4Gr1UGVIPskLPygTFyJr7aPFgv0++RIT+s5g7SnqwHH7oA== 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)(10201501046)(93006095)(93001095)(3002001)(3231232)(944501410)(52105095)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:HE1PR0801MB1980; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB1980; X-Forefront-PRVS: 0654257CF5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(396003)(39850400004)(39380400002)(346002)(376002)(189003)(199004)(1076002)(106356001)(956004)(55236004)(53936002)(6506007)(2616005)(2906002)(110136005)(81156014)(36756003)(6116002)(97736004)(8936002)(3846002)(86362001)(47776003)(105586002)(11346002)(50226002)(81166006)(53416004)(7736002)(305945005)(476003)(486006)(446003)(316002)(6666003)(16526019)(76176011)(5660300001)(8676002)(386003)(6512007)(186003)(50466002)(48376002)(16586007)(66066001)(51416003)(6486002)(26005)(52116002)(69596002)(25786009)(68736007)(478600001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1980; H:rkaganb.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0801MB1980; 23:dsDh/vABoGQOUsFwc+mph0YYvulZNc+WX+TVSiq?= zDKMzjJ50ayFTMYCLNik358IZN4nhcQtiez42+KLRpucTsV+L14MQTBhYTseiKkxb6t9aVmEdOhcM5wXtJfTj+36UDFBamILbPlYEuExIiC4jRbQBZZu39rqTbZeRdB8yAhKBtEaVpijr/PEfsoSq0fEH5DEOhklsyL7fxBrmi7DzwJv5AlTorGAjwQkdl8i34wDy/M932L2n0tzKe0/8nL96w1BpbCCmYWay9g0kd6GyCBS/mzeFKGxa8gBahraoiK7TNREX2Uzxps9XOGP1Qis+yrrWwmjMqzj2JEkMhqF4PCyyMoLTtgG7P8k/OAA5UPH+opEDibc7EaM5rO6lEDveuPcQmdeNCGMA4gDhvEqM8RHSHSi16m/Kn+HaRPGHqL11qGKxzp90KDPDaEckfCLzQEp3vJ09kWFL010zd+Ok/28BRIf2LuD5+rdlCm6TWNZBfv1IDfleaQX0AmI1ziXsCuPESfh6WRWhMDNL6YaMlT0rItCAMW2LrvL5UFoufidiImhVOdhZenlIgNuqER9ftvm1CI6OnIwBcgS3vX/4UfN63+mVfP1lnFHWQXAFrMLVaXqryrK+KEjsYgiA24GtnrTdPFiGNQaZgYklyqzMNjWmvnHqrPWNNKmrTGLU/YpxElZ3Ps11MGV7QAb71rL5regHil5C68IVRAUXe1YeJjOI4b1kf86XanUW/6G0SUfXioRZlei2dQ1+TC9DuSEcrb9h5aaA6rAZ5swodfZFEpvpxX1geY148iawGDummJW9Hfi1UY0j71qbauMESUM63V6gm8ROBYbR2Nvsv8FeyrL2XtZm87gMLrwJ9t575feXhwYirstrWHcwVXTNYK+gcv8tirvmJ+D72u895pQbUYv6Sd8dq8ss2MzIdT1+Enr5L/DgC1deIXmsQcerS1ISKtTftkm1riKuEDt/WrDGZMFJoUECO9qwFAdSSyf4i8V1FR6v0VCbb/8WoLTH7cvug7KxIZ96b4RJHsmUh/8CbsvJ37clolbMlKeu+crunvNrrBtiY+SCojFge370OB8RAFNL/a6k6CAPrmzAV+OExfNa5xYt+FHKioR/R//1+WKrL0yhU2yOxeWwR/OEY2+iXLE752DpFDtJSVTgb3dX20IRX55qnrgGyl2g/kIqAhYISnVKvwTJDUWWE8qXtSBCx0xVPqT2CPSpy7p1rb2FonLGYKhUkFi1TkpGI4cVmhA= X-Microsoft-Antispam-Message-Info: NyHPRmzDjuyGCBQUcLfHjYbqK5kQZvBTvNBsMIB3IpKJ7998WOAgbMOxOlRBxkG/77P2MNQP4o3CUqx/7jNLFWapbp6g81N1YW0kjIKaoPFDCnpyKVb2nTkZXgoeGtaPjXU6qK2JpJhfgx+w9YumqTwGdMBB7dNFzO4Bv7pkdSAwzH9TqgTTayZctV0EH+p9 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 6:STUo55LIq19H7RDkkkqcauQ5Uipp8VjdVC8CIJ0ZdZ/2sFqjuCQkL3TT9hrdaUF79mwEZBOE72SUlTfyQpvxjsXaqWj2EaHh1nP1iniQVEO6fx6p4co7qx1C2AeABBpJz32o1IJhCYkNHvAPSKYeQn1Z+BrY5piOnTY8A05W/jRIM7xYmj/ilDGMGDMcIcQyESMCJ9GDrYhxZK2XDWqL4MXLY7rgFNZNzTLBf9tXPCT6rXDmUSBJbDErTKopNkq0F7Hekxv7iv4AYA2B5vi0R8hz4i5EqZvfbhBeTeVcHydpJBXU4oYgLXdtbw9rpxuEw987025KZV4yJBrmEa3bhiIOdgi5fk3hoLQhUAp9/xMUihus3a55/CXOrdL0xcQEz23yJGm5oGC7qJagXzQifbMBg+M54VwEJKGllW67gdZwnhDj2x8XU4uPvn8Pcmchjmx1kjXzs9kfR3MzZJgHqQ==; 5:yVSYCdscb+UW9rTyiLOOWQwW11e93rdr41pBiMf7KOL/xE0Qwn/hN97ClUX9PR8y7fdcbfD0ETGIA35yuLEdHNTb4jbq0mBQNWr04GgWaWZ5DxwSM/eiQiGCec5hOPTli5ePlADSRJiRLjSMU8KxnQXKbsWv6z/PXk6r2kxGEj8=; 24:IFYDizoiuygGNRbA1zqEL64nMspZqRyLDvw95QbbjIHluEhLVqHuIhp9adSZN1EHnR61tLShYhOz44goH1/NK/sv2Bl0p7SvgcrYTP8Aha8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1980; 7:Qan3GN5sizwBFmY4Phqf//9v0CUzeDLY+u1v1RTIu+9HRuVcqkD0gR+QB27AB1hXQTb7y5ecnS22HUyukCXsr9fsmBXbQKZY1xcAaj34Hjtl72M7mFuLSFH4ssXqiUoJiz1EZnf7kwXniFnaSgnwAdt5KEBwXWk/Pm2PHvL20xMks3wYTKzzx+vJ4S+xKn4ffMMsAcdye2FwkDZlWT924Fx5xA72oDHdSx0VgDKZ3s73Cgm1pEriz1Chos/ZHEQ9; 20:BRVopM3bgJEr+/LwfWNxYsT9t6wBDyxuoRmJdG4b2BLiQa8lfI6Wi9viacGh3Ah9ZUpUVFN2oVEeDlxSmjuZj/67GvyTBtBfY+31R+NJLp02ML8S9xtv9D9x7ngvsUf1rKrayRilOFFHXV1M+6wQuHQN6AnU08P/SmkyDVyMQ2M= X-MS-Office365-Filtering-Correlation-Id: a19f888c-1b13-46ad-f2bd-08d5ab9193e1 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2018 16:20:08.0428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a19f888c-1b13-46ad-f2bd-08d5ab9193e1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1980 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.0.132 Subject: [Qemu-devel] [PATCH 04/17] iotest 030: skip quorum test setup/teardown too 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If quorum driver is not enabled, test 030 skips the corresponding testcase. This, however, is insufficient: quorum is first used in the testsuite's setUp. To avoid erroring out here, skip setUp/tearDown, too. Signed-off-by: Roman Kagan Reviewed-by: Max Reitz --- tests/qemu-iotests/030 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 640a6dfd10..6b20ff005e 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -423,6 +423,9 @@ class TestQuorum(iotests.QMPTestCase): backing = [] def setUp(self): + if not iotests.supports_quorum(): + return + opts = ['driver=quorum', 'vote-threshold=2'] # Initialize file names and command-line options @@ -445,6 +448,9 @@ class TestQuorum(iotests.QMPTestCase): self.vm.launch() def tearDown(self): + if not iotests.supports_quorum(): + return + self.vm.shutdown() for img in self.children: os.remove(img)