Merge "Re-enable tests that were disabled due to bug #1623576"
diff --git a/designate_tempest_plugin/services/dns/v2/json/recordset_client.py b/designate_tempest_plugin/services/dns/v2/json/recordset_client.py
index 578ccf3..1cf281c 100644
--- a/designate_tempest_plugin/services/dns/v2/json/recordset_client.py
+++ b/designate_tempest_plugin/services/dns/v2/json/recordset_client.py
@@ -19,6 +19,20 @@
class RecordsetClient(base.DnsClientV2Base):
"""API V2 Tempest REST client for Recordset API"""
+ SHOW_STATUS_CODES = [200, 301]
+
+ def __init__(self, auth_provider, service, region,
+ endpoint_type='publicURL',
+ build_interval=1, build_timeout=60,
+ disable_ssl_certificate_validation=False, ca_certs=None,
+ trace_requests='', name=None, http_timeout=None,
+ proxy_url=None):
+ super(RecordsetClient, self).__init__(
+ auth_provider, service, region, endpoint_type, build_interval,
+ build_timeout, disable_ssl_certificate_validation, ca_certs,
+ trace_requests, name, http_timeout, proxy_url,
+ follow_redirects=False)
+
@base.handle_errors
def create_recordset(self, zone_uuid, recordset_data,
params=None, wait_until=False):
diff --git a/designate_tempest_plugin/tests/api/v2/test_recordset.py b/designate_tempest_plugin/tests/api/v2/test_recordset.py
index be06b54..631c34e 100644
--- a/designate_tempest_plugin/tests/api/v2/test_recordset.py
+++ b/designate_tempest_plugin/tests/api/v2/test_recordset.py
@@ -341,7 +341,6 @@
self.assertGreater(len(body['recordsets']), 0)
- @decorators.skip_because(bug="1616892")
@decorators.idempotent_id('65ec0495-81d9-4cfb-8007-9d93b32ae883')
def test_get_single_zones_recordsets(self):
recordset_data = data_utils.rand_recordset_data(
diff --git a/tox.ini b/tox.ini
index 4d9c7df..24f9f4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,11 +31,12 @@
OS_STDOUT_CAPTURE
[testenv:pep8]
-basepython = python2.7
+basepython = python3
commands = sh tools/pretty_flake8.sh
[testenv:docs]
+basepython = python3
commands = rm -rf doc/build
sphinx-build -E -W -b html doc/source doc/build/html
@@ -66,6 +67,7 @@
commands=pip-missing-reqs -d --ignore-file=designate/tests/* designate
[testenv:venv]
+basepython = python3
commands = {posargs}
[flake8]