Merge "Follow up fixes to recycle bin tests"
diff --git a/manila_tempest_tests/tests/api/admin/test_replication.py b/manila_tempest_tests/tests/api/admin/test_replication.py
index 853471c..242e786 100644
--- a/manila_tempest_tests/tests/api/admin/test_replication.py
+++ b/manila_tempest_tests/tests/api/admin/test_replication.py
@@ -45,7 +45,6 @@
def resource_setup(cls):
super(ReplicationAdminTest, cls).resource_setup()
cls.admin_client = cls.admin_shares_v2_client
- cls.member_client = cls.shares_v2_client
cls.replication_type = CONF.share.backend_replication_type
cls.multitenancy_enabled = (
utils.replication_with_multitenancy_support())
@@ -138,7 +137,8 @@
version=version)
# Original replica will need to be cleaned up before the promoted
# replica can be deleted.
- self.addCleanup(self.delete_share_replica, original_replica['id'])
+ self.addCleanup(self.delete_share_replica, original_replica['id'],
+ client=self.admin_client)
# Check if there is still only 1 'active' replica after promotion.
replica_list = self.admin_client.list_share_replicas(