From nobody Tue Apr 30 23:35:29 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 1487265817366230.28785481871762; Thu, 16 Feb 2017 09:23:37 -0800 (PST) Received: from lists.phx.ovirt.org (localhost [127.0.0.1]) by lists.ovirt.org (Postfix) with ESMTP id 1C154820673; Thu, 16 Feb 2017 17:23:33 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lists.ovirt.org (Postfix) with ESMTPS id 4162182064B for ; Thu, 16 Feb 2017 17:23:10 +0000 (UTC) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v1GHKtkl000976 for ; Thu, 16 Feb 2017 12:23:09 -0500 Received: from e24smtp03.br.ibm.com (e24smtp03.br.ibm.com [32.104.18.24]) by mx0a-001b2d01.pphosted.com with ESMTP id 28nefj5u7b-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 16 Feb 2017 12:23:09 -0500 Received: from localhost by e24smtp03.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 16 Feb 2017 15:23:07 -0200 Received: from d24dlp02.br.ibm.com (9.18.248.206) by e24smtp03.br.ibm.com (10.172.0.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 16 Feb 2017 15:23:04 -0200 Received: from d24relay04.br.ibm.com (d24relay04.br.ibm.com [9.18.232.146]) by d24dlp02.br.ibm.com (Postfix) with ESMTP id 475FD1DC006E for ; Thu, 16 Feb 2017 12:23:05 -0500 (EST) Received: from d24av02.br.ibm.com (d24av02.br.ibm.com [9.8.31.93]) by d24relay04.br.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v1GHMxDX27066532 for ; Thu, 16 Feb 2017 15:23:04 -0200 Received: from d24av02.br.ibm.com (localhost [127.0.0.1]) by d24av02.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v1GHMiAn027908 for ; Thu, 16 Feb 2017 15:22:44 -0200 Received: from alinefm-TP440.ibmmodules.com ([9.80.208.98]) by d24av02.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v1GHMe79027772 for ; Thu, 16 Feb 2017 15:22:43 -0200 X-Original-To: kimchi-devel@ovirt.org From: Aline Manera To: Kimchi Devel Date: Thu, 16 Feb 2017 15:22:30 -0200 X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170216172230.9699-1-alinefm@linux.vnet.ibm.com> References: <20170216172230.9699-1-alinefm@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17021617-0024-0000-0000-0000015472A7 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17021617-0025-0000-0000-000016197501 Message-Id: <20170216172230.9699-2-alinefm@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-02-16_13:, , 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-1612050000 definitions=main-1702160162 Subject: [Kimchi-devel] [PATCH] [Kimchi] Fix patch_auth() call according to Wok changes 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: Aline Manera Reviewed-By: Lucio Correia --- mockmodel.py | 2 -- tests/test_authorization.py | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/mockmodel.py b/mockmodel.py index 9e27d3f..192979f 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -56,8 +56,6 @@ from wok.plugins.kimchi.model.vmhostdevs import VMHostDev= sModel from wok.plugins.kimchi.utils import get_next_clone_name, pool_name_from_u= ri from wok.plugins.kimchi.vmtemplate import VMTemplate =20 - -fake_user =3D {'root': 'letmein!'} mockmodel_defaults =3D { 'domain': 'test', 'arch': 'i686' } diff --git a/tests/test_authorization.py b/tests/test_authorization.py index b67d8d6..664e017 100644 --- a/tests/test_authorization.py +++ b/tests/test_authorization.py @@ -19,16 +19,16 @@ =20 import cherrypy import json +import mock import os import unittest from functools import partial =20 -from tests.utils import get_fake_user, patch_auth +from tests.utils import patch_auth from tests.utils import request, run_server, wait_task =20 from iso_gen import construct_fake_iso =20 - test_server =3D None model =3D None fake_iso =3D '/tmp/fake.iso' @@ -37,7 +37,7 @@ fake_iso =3D '/tmp/fake.iso' def setUpModule(): global test_server, model =20 - patch_auth(sudo=3DFalse) + patch_auth() test_server =3D run_server(test_mode=3DTrue) model =3D cherrypy.tree.apps['/plugins/kimchi'].root.model =20 @@ -52,10 +52,13 @@ def tearDownModule(): =20 class AuthorizationTests(unittest.TestCase): def setUp(self): - self.request =3D partial(request) + self.request =3D partial(request, user=3D'user') model.reset() =20 - def test_nonroot_access(self): + @mock.patch('wok.plugins.kimchi.model.users.PAMUsersModel._validate') + def test_nonroot_access(self, validate_users): + validate_users.return_value =3D True + # Non-root users can not create or delete network (only get) resp =3D self.request('/plugins/kimchi/networks', '{}', 'GET') self.assertEquals(200, resp.status) @@ -102,10 +105,8 @@ class AuthorizationTests(unittest.TestCase): }) wait_task(model.task_lookup, task_info['id']) =20 - fake_user =3D get_fake_user() - model.vm_update(u'test-me', - {'users': [fake_user.keys()[0]], + {'users': ['user'], 'groups': []}) =20 task_info =3D model.vms_create({ @@ -114,7 +115,7 @@ class AuthorizationTests(unittest.TestCase): }) wait_task(model.task_lookup, task_info['id']) =20 - non_root =3D list(set(model.users_get_list()) - set(['root']))[0] + non_root =3D list(set(model.users_get_list()) - set(['admin']))[0] model.vm_update(u'test-usera', {'users': [non_root], 'groups': []}) =20 task_info =3D model.vms_create({ --=20 2.9.3 _______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel