From nobody Wed May 8 03:20:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of ovirt.org designates 66.187.230.42 as permitted sender) client-ip=66.187.230.42; envelope-from=kimchi-devel-bounces@ovirt.org; helo=lists.ovirt.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of ovirt.org designates 66.187.230.42 as permitted sender) smtp.mailfrom=kimchi-devel-bounces@ovirt.org; Return-Path: Received: from lists.ovirt.org (lists.phx.ovirt.org [66.187.230.42]) by mx.zohomail.com with SMTPS id 1489183660603879.2408926297098; Fri, 10 Mar 2017 14:07:40 -0800 (PST) Received: from lists.phx.ovirt.org (localhost [127.0.0.1]) by lists.ovirt.org (Postfix) with ESMTP id B305482063D; Fri, 10 Mar 2017 22:07:39 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lists.ovirt.org (Postfix) with ESMTPS id DAFA88205D8 for ; Fri, 10 Mar 2017 22:06:30 +0000 (UTC) Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v2AM4DrQ060348 for ; Fri, 10 Mar 2017 17:06:30 -0500 Received: from e24smtp04.br.ibm.com (e24smtp04.br.ibm.com [32.104.18.25]) by mx0b-001b2d01.pphosted.com with ESMTP id 2942mnmfjd-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 10 Mar 2017 17:06:29 -0500 Received: from localhost by e24smtp04.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 10 Mar 2017 19:06:28 -0300 Received: from d24relay04.br.ibm.com (9.18.232.146) by e24smtp04.br.ibm.com (10.172.0.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 10 Mar 2017 19:06:26 -0300 Received: from d24av01.br.ibm.com (d24av01.br.ibm.com [9.8.31.91]) by d24relay04.br.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v2AM6PWa29556950 for ; Fri, 10 Mar 2017 19:06:25 -0300 Received: from d24av01.br.ibm.com (localhost [127.0.0.1]) by d24av01.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v2AM6PhN018254 for ; Fri, 10 Mar 2017 19:06:25 -0300 Received: from t440.ibm.com ([9.80.210.122]) by d24av01.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v2AM6BKC018086; Fri, 10 Mar 2017 19:06:23 -0300 X-Original-To: kimchi-devel@ovirt.org From: Lucio Correia To: Kimchi Devel Date: Fri, 10 Mar 2017 19:06:09 -0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489183571-10933-1-git-send-email-luciojhc@linux.vnet.ibm.com> References: <1489183571-10933-1-git-send-email-luciojhc@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17031022-0028-0000-0000-0000019EA796 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17031022-0029-0000-0000-0000149CC861 Message-Id: <1489183571-10933-7-git-send-email-luciojhc@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-03-10_15:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703100171 Subject: [Kimchi-devel] [PATCH] [Kimchi 6/8] Skip tests that need to run as root X-BeenThere: kimchi-devel@ovirt.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: kimchi-devel-bounces@ovirt.org Errors-To: kimchi-devel-bounces@ovirt.org X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Lucio Correia --- tests/test_model.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index 8595862..8f7f147 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -512,6 +512,7 @@ class ModelTests(unittest.TestCase): mock_handleVMOff.assert_called_once_with('kimchi-vm') mock_add_port.assert_called_once_with('kimchi-vm', '6660') =20 + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') @mock.patch('wok.plugins.kimchi.model.virtviewerfile.run_command') def test_firewall_provider_firewallcmd(self, mock_run_cmd): mock_run_cmd.side_effect =3D [ @@ -530,6 +531,7 @@ class ModelTests(unittest.TestCase): mock.call(['firewall-cmd', '--add-port=3D5905/tcp']), mock.call(['firewall-cmd', '--remove-port=3D5905/tcp'])]) =20 + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') @mock.patch('wok.plugins.kimchi.model.virtviewerfile.run_command') def test_firewall_provider_ufw(self, mock_run_cmd): mock_run_cmd.side_effect =3D [ @@ -549,6 +551,7 @@ class ModelTests(unittest.TestCase): mock.call(['ufw', 'allow', '5905/tcp']), mock.call(['ufw', 'deny', '5905/tcp'])]) =20 + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') @mock.patch('wok.plugins.kimchi.model.virtviewerfile.run_command') def test_firewall_provider_iptables(self, mock_run_cmd): mock_run_cmd.side_effect =3D [ @@ -1105,6 +1108,7 @@ class ModelTests(unittest.TestCase): ) self.assertEqual(created_disk_format, 'qcow2') =20 + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_memory_hotplug(self): config.set("authentication", "method", "pam") inst =3D model.Model("qemu:///session", objstore_loc=3Dself.tmp_st= ore) @@ -1208,9 +1212,12 @@ class ModelTests(unittest.TestCase): self.assertRaises(InvalidOperation, inst.vm_update, 'kimchi-vm1', params) =20 + def _host_is_power(): + return platform.machine().startswith('ppc') + msg =3D "Memory hotplug in non-numa guests only for PowerPC arch." =20 - @unittest.skipUnless(('ppc64' in os.uname()[4]), msg) + @unittest.skipUnless(utils.running_as_root() and _host_is_power(), msg) def test_non_numa_vm_memory_hotplug(self): config.set("authentication", "method", "pam") inst =3D model.Model("qemu:///session", objstore_loc=3Dself.tmp_st= ore) @@ -1254,6 +1261,7 @@ class ModelTests(unittest.TestCase): self.assertEquals(params['memory']['current'], inst.vm_lookup(vm)['memory']['current']) =20 + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_edit(self): config.set("authentication", "method", "pam") inst =3D model.Model(None, @@ -1786,10 +1794,8 @@ class ModelTests(unittest.TestCase): volumes =3D inst.storagevolumes_get_list(args['name']) self.assertEquals(len(volumes), 2) =20 - def _host_is_power(): - return platform.machine().startswith('ppc') - - @unittest.skipUnless(_host_is_power(), 'Only required for Power hosts') + @unittest.skipUnless(utils.running_as_root() and _host_is_power(), + 'Only required for Power hosts') def test_pci_hotplug_requires_usb_controller(self): config.set("authentication", "method", "pam") inst =3D model.Model("qemu:///session", objstore_loc=3Dself.tmp_st= ore) --=20 2.7.4 _______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel