Merge "Update README to use stestr instead testr"
diff --git a/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py b/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py
index cd4af56..d2fa78c 100644
--- a/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py
+++ b/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py
@@ -84,14 +84,14 @@
def check_login_page(self):
response = self._get_opener().open(CONF.dashboard.dashboard_url).read()
- self.assertIn("id_username", response)
+ self.assertIn("id_username", response.decode("utf-8"))
def user_login(self, username, password):
response = self._get_opener().open(CONF.dashboard.dashboard_url).read()
# Grab the CSRF token and default region
parser = HorizonHTMLParser()
- parser.feed(response)
+ parser.feed(response.decode("utf-8"))
# construct login url for dashboard, discovery accommodates non-/ web
# root for dashboard
@@ -109,11 +109,11 @@
'region': parser.region,
'domain': CONF.auth.default_credentials_domain_name,
'csrfmiddlewaretoken': parser.csrf_token}
- self._get_opener().open(req, parse.urlencode(params))
+ self._get_opener().open(req, parse.urlencode(params).encode())
def check_home_page(self):
response = self._get_opener().open(CONF.dashboard.dashboard_url).read()
- self.assertIn('Overview', response)
+ self.assertIn('Overview', response.decode("utf-8"))
def _get_opener(self):
if not self.opener:
@@ -133,6 +133,7 @@
def _ssl_default_context_supported(self):
return (hasattr(ssl, 'create_default_context'))
+ @decorators.attr(type='smoke')
@decorators.idempotent_id('4f8851b1-0e69-482b-b63b-84c6e76f6c80')
def test_basic_scenario(self):
creds = self.os_primary.credentials
diff --git a/tox.ini b/tox.ini
index 47d4fa6..13d72c6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,18 +12,23 @@
commands = python setup.py test --slowest --testr-args='{posargs}'
[testenv:pep8]
+basepython = python3
commands = flake8
[testenv:venv]
+basepython = python3
commands = {posargs}
[testenv:cover]
+basepython = python3
commands = python setup.py test --coverage --testr-args='{posargs}'
[testenv:docs]
+basepython = python3
commands = python setup.py build_sphinx
[testenv:debug]
+basepython = python3
commands = oslo_debug_helper {posargs}
[flake8]