From nobody Fri Apr 26 20:22:17 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 1487969706993950.3914753908653; Fri, 24 Feb 2017 12:55:06 -0800 (PST) Received: from lists.phx.ovirt.org (localhost [127.0.0.1]) by lists.ovirt.org (Postfix) with ESMTP id AD55482052D; Fri, 24 Feb 2017 20:55:03 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lists.ovirt.org (Postfix) with ESMTPS id 13B06820523 for ; Fri, 24 Feb 2017 20:54:40 +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 v1OKnfGm022212 for ; Fri, 24 Feb 2017 15:54:40 -0500 Received: from e24smtp04.br.ibm.com (e24smtp04.br.ibm.com [32.104.18.25]) by mx0b-001b2d01.pphosted.com with ESMTP id 28tp2vqjpg-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 24 Feb 2017 15:54:40 -0500 Received: from localhost by e24smtp04.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 24 Feb 2017 17:54:38 -0300 Received: from d24dlp02.br.ibm.com (9.18.248.206) by e24smtp04.br.ibm.com (10.172.0.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 24 Feb 2017 17:54:35 -0300 Received: from d24relay02.br.ibm.com (d24relay02.br.ibm.com [9.18.232.42]) by d24dlp02.br.ibm.com (Postfix) with ESMTP id 76F7C1DC0054 for ; Fri, 24 Feb 2017 15:54:36 -0500 (EST) Received: from d24av03.br.ibm.com (d24av03.br.ibm.com [9.8.31.95]) by d24relay02.br.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v1OKsZeG38862884 for ; Fri, 24 Feb 2017 17:54:35 -0300 Received: from d24av03.br.ibm.com (localhost [127.0.0.1]) by d24av03.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v1OKsZuw018616 for ; Fri, 24 Feb 2017 17:54:35 -0300 Received: from t440.ibm.com ([9.85.185.29]) by d24av03.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v1OKsUnd018581; Fri, 24 Feb 2017 17:54:33 -0300 X-Original-To: kimchi-devel@ovirt.org From: Lucio Correia To: Kimchi Devel Date: Fri, 24 Feb 2017 17:54:23 -0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487969663-13676-1-git-send-email-luciojhc@linux.vnet.ibm.com> References: <1487969663-13676-1-git-send-email-luciojhc@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17022420-0028-0000-0000-000001993FD6 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17022420-0029-0000-0000-000014965941 Message-Id: <1487969663-13676-2-git-send-email-luciojhc@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-02-24_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-1702240197 Subject: [Kimchi-devel] [PATCH] [Wok] Do not use proxy when running tests 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" Currently administration permissions are required to run tests in order to change nginx configuration. With this patch, tests requests are handled directly by cherrypy, without being proxied by nginx. This allows tests to be run without administration permissions. Signed-off-by: Lucio Correia --- src/wok/server.py | 3 ++- tests/utils.py | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/wok/server.py b/src/wok/server.py index fc2e167..cdffe6d 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -69,7 +69,8 @@ class Server(object): config.config.set(sec, item, str(getattr(options, item= ))) =20 # Check proxy configuration - check_proxy_config() + if not hasattr(options, 'no_proxy') or not options.no_proxy: + check_proxy_config() =20 make_dirs =3D [ os.path.abspath(config.get_log_download_path()), diff --git a/tests/utils.py b/tests/utils.py index 3c7e9da..2e4c63a 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -40,6 +40,7 @@ from wok.exception import NotFoundError, OperationFailed from wok.utils import wok_log =20 HOST =3D '0.0.0.0' +PORT =3D 8010 PROXY_PORT =3D 8001 =20 fake_user =3D {'admin': 'letmein!', 'user': 'letmein!'} @@ -88,14 +89,15 @@ if sys.version_info[:2] =3D=3D (2, 6): unittest.TestCase.assertNotIn =3D assertNotIn =20 =20 -def run_server(test_mode, environment=3D'dev', server_root=3D''): +def run_server(test_mode, environment=3D'dev', server_root=3D'', no_proxy= =3DTrue): =20 + port =3D PORT if no_proxy else PROXY_PORT args =3D type('_', (object,), - {'cherrypy_port': 8010, 'max_body_size': '4*1024', + {'cherrypy_port': port, 'max_body_size': '4*1024', 'test': test_mode, 'access_log': '/dev/null', 'error_log': '/dev/null', 'environment': environment, 'log_level': 'debug', 'session_timeout': 10, - 'server_root': server_root})() + 'server_root': server_root, 'no_proxy': no_proxy})() =20 s =3D wok.server.Server(args) t =3D threading.Thread(target=3Ds.start) @@ -121,8 +123,8 @@ def _request(conn, path, data, method, headers, user): return conn.getresponse() =20 =20 -def request(path, data=3DNone, method=3D'GET', headers=3DNone, user=3D'adm= in'): - # verify if HTTPSConnection has context parameter +def requestHttps(path, data=3DNone, method=3D'GET', headers=3DNone, user= =3D'admin'): + # To work, this requires run_server() to be called with no_proxy=3DFal= se. if "context" in inspect.getargspec(httplib.HTTPSConnection.__init__).a= rgs: context =3D ssl._create_unverified_context() conn =3D httplib.HTTPSConnection(HOST, PROXY_PORT, context=3Dconte= xt) @@ -132,6 +134,11 @@ def request(path, data=3DNone, method=3D'GET', headers= =3DNone, user=3D'admin'): return _request(conn, path, data, method, headers, user) =20 =20 +def request(path, data=3DNone, method=3D'GET', headers=3DNone, user=3D'adm= in'): + conn =3D httplib.HTTPConnection(HOST, PORT) + return _request(conn, path, data, method, headers, user) + + class FakeUser(User): auth_type =3D "fake" =20 --=20 2.7.4 _______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel