Merge "Add support for handling multiple error codes"
diff --git a/.zuul.yaml b/.zuul.yaml
index 1eab464..60f0d05 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -123,7 +123,3 @@
jobs:
- patrole-admin
- patrole-member
- - patrole-member-queens
- - patrole-member-pike
- - patrole-py35-member
- - openstack-tox-lower-constraints
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_actions_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_actions_rbac.py
index dcc2bd5..a8c1727 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volume_actions_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volume_actions_rbac.py
@@ -141,16 +141,6 @@
self.addCleanup(self.volumes_client.update_volume_readonly,
self.volume['id'], readonly=False)
- @decorators.idempotent_id('72bab13c-dfaf-4b6d-a132-c83a85fb1776')
- @rbac_rule_validation.action(
- service="cinder",
- rule="volume_extension:volume_unmanage")
- def test_unmanage_volume(self):
- volume = self.create_volume()
-
- with self.rbac_utils.override_role(self):
- self.volumes_client.unmanage_volume(volume['id'])
-
@decorators.idempotent_id('59b783c0-f4ef-430c-8a90-1bad97d4ec5c')
@rbac_rule_validation.action(service="cinder",
rule="volume:update")
diff --git a/tox.ini b/tox.ini
index cca09d0..a09822f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,16 +21,20 @@
stestr --test-path ./patrole_tempest_plugin/tests/unit run {posargs}
[testenv:pep8]
+basepython = python3
commands = flake8 {posargs}
check-uuid --package patrole_tempest_plugin.tests.api
[testenv:uuidgen]
+basepython = python3
commands = check-uuid --package patrole_tempest_plugin.tests.api --fix
[testenv:venv]
+basepython = python3
commands = {posargs}
[testenv:cover]
+basepython = python3
commands = rm -rf *.pyc
rm -rf cover
rm -f .coverage
@@ -46,6 +50,7 @@
rm
[testenv:docs]
+basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/requirements.txt
@@ -56,6 +61,7 @@
whitelist_externals = rm
[testenv:releasenotes]
+basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/requirements.txt
@@ -66,9 +72,11 @@
whitelist_externals = rm
[testenv:debug]
+basepython = python3
commands = oslo_debug_helper -t patrole_tempest_plugin/tests {posargs}
[testenv:genconfig]
+basepython = python3
commands = oslo-config-generator --config-file etc/config-generator.patrole.conf
[flake8]