commit 869fe2c804c12da5f224856e9b0e08efa122f358
author Zuul <zuul@review.openstack.org> Tue Jan 30 18:01:20 2018 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 30 18:01:20 2018 +0000
tree fc355cd7f555c528419defc735ba874bc8738699
parent 97c42afccc32042ef3be4c4c4ebf01196d36633f
parent 795dae5249640ffba467b47b506c84c7676b34b6

Merge "Remove unnecessary dir 'legacy'"

.zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 35835e5..387c042 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -65,7 +65,6 @@
     post-run: playbooks/patrole-py35-member/post.yaml
 
 - project:
-    name: openstack/patrole
     check:
       jobs:
         - patrole-admin

patrole_tempest_plugin/rbac_rule_validation.py

diff --git a/patrole_tempest_plugin/rbac_rule_validation.py b/patrole_tempest_plugin/rbac_rule_validation.py
index 75d1baa..daf03e4 100644
--- a/patrole_tempest_plugin/rbac_rule_validation.py
+++ b/patrole_tempest_plugin/rbac_rule_validation.py
@@ -175,10 +175,6 @@
                         "OverPermission: Role %s was allowed to perform %s" %
                         (role, rule))
             finally:
-                # TODO(felipemonteiro): Remove the call below once all the
-                # tests have migrated over to `override_role` public method.
-                test_obj.rbac_utils._override_role(test_obj,
-                                                   toggle_rbac_role=False)
                 if CONF.patrole_log.enable_reporting:
                     RBACLOG.info(
                         "[Service]: %s, [Test]: %s, [Rule]: %s, "