From aa3807dfcc9637e10c66701ebdfab03a6d41045f Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Tue, 5 Oct 2021 17:10:46 +0200 Subject: [PATCH] Add a request timeout, and pass in cacert when talking to horizon (#649) --- zaza/openstack/charm_tests/openstack_dashboard/tests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zaza/openstack/charm_tests/openstack_dashboard/tests.py b/zaza/openstack/charm_tests/openstack_dashboard/tests.py index 4746b9f..60ac7eb 100644 --- a/zaza/openstack/charm_tests/openstack_dashboard/tests.py +++ b/zaza/openstack/charm_tests/openstack_dashboard/tests.py @@ -66,7 +66,7 @@ def _login(dashboard_url, domain, username, password, cafile=None): # start session, get csrftoken client = requests.session() - client.get(auth_url, verify=cafile) + client.get(auth_url, verify=cafile, timeout=30) if 'csrftoken' in client.cookies: csrftoken = client.cookies['csrftoken'] else: @@ -501,7 +501,8 @@ class OpenStackDashboardPolicydTests(policyd.BasePolicydSpecialization, domain = 'admin_domain' username = 'admin' client, response = _login( - self.get_horizon_url(), domain, username, password) + self.get_horizon_url(), domain, username, password, + cafile=self.cacert) # now attempt to get the domains page _url = self.url.format(unit.public_address) logging.info("URL is {}".format(_url))