[Gate fix] Change expected_error_code to 403 for some subnetpool tests
This change corrects some expected_error_code's for subnetpool tests.
These endpoints actually raise a 403, not a 404 (example: [0]):
- test_update_subnetpool_is_default
- test_delete_subnetpool
This commit also corrects resource_cleanup in
test_image_resource_types_rbac which wrongly calls super
resource_setup in resource_cleanup.
These changes have been combined to unblock the gate.
[0] http://logs.openstack.org/80/496080/9/check/gate-tempest-dsvm-patrole-member-ubuntu-xenial/f9cde4d/console.html#_2017-09-11_14_55_54_024285
Change-Id: If4399c5f67058925c800bd2ce32c19bf6657d9b5
diff --git a/patrole_tempest_plugin/tests/api/image/test_image_resource_types_rbac.py b/patrole_tempest_plugin/tests/api/image/test_image_resource_types_rbac.py
index 6727cc8..456e10b 100644
--- a/patrole_tempest_plugin/tests/api/image/test_image_resource_types_rbac.py
+++ b/patrole_tempest_plugin/tests/api/image/test_image_resource_types_rbac.py
@@ -37,7 +37,7 @@
test_utils.call_and_ignore_notfound_exc(
cls.namespaces_client.delete_namespace,
cls.namespace_name)
- super(ImageResourceTypesRbacTest, cls).resource_setup()
+ super(ImageResourceTypesRbacTest, cls).resource_cleanup()
@rbac_rule_validation.action(service="glance",
rule="list_metadef_resource_types")
diff --git a/patrole_tempest_plugin/tests/api/network/test_subnetpools_rbac.py b/patrole_tempest_plugin/tests/api/network/test_subnetpools_rbac.py
index 8c799b6..44f6be4 100644
--- a/patrole_tempest_plugin/tests/api/network/test_subnetpools_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_subnetpools_rbac.py
@@ -102,8 +102,7 @@
@decorators.idempotent_id('a16f4e5c-0675-415f-b636-00af00638693')
@rbac_rule_validation.action(service="neutron",
- rule="update_subnetpool:is_default",
- expected_error_code=404)
+ rule="update_subnetpool:is_default")
def test_update_subnetpool_is_default(self):
"""Update default subnetpool.
@@ -123,8 +122,7 @@
default_pool['id'], description=original_desc, is_default=True)
@rbac_rule_validation.action(service="neutron",
- rule="delete_subnetpool",
- expected_error_code=404)
+ rule="delete_subnetpool")
@decorators.idempotent_id('50f5944e-43e5-457b-ab50-fb48a73f0d3e')
def test_delete_subnetpool(self):
"""Delete subnetpool.