RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-21 02:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

tasks/cephfs: reset IDs of mounts between tests

Browse Source 
because volumeclient test twiddles the IDs to
match the auth identities it creates.

Signed-off-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2015-11-11 10:23:40 +00:00
parent 7a19b6dc0d
commit b94b35b68f
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tasks/cephfs/cephfs_test_case.py
View File

@ -140,6 +140,12 @@ class CephFSTestCase(unittest.TestCase):
'mon', 'allow r',
'osd', 'allow rw pool={0}'.format(self.fs.get_data_pool_name()))
log.info(client_mount_ids)
# In case the test changes the IDs of clients, stash them so that we can
# reset in tearDown
self._original_client_ids = client_mount_ids
# In case there were any extra auth identities around from a previous
# test, delete them
for entry in self.auth_list():
@ -171,6 +177,9 @@ class CephFSTestCase(unittest.TestCase):
for m in self.mounts:
m.teardown()
for i, m in enumerate(self.mounts):
m.client_id = self._original_client_ids[i]
for subsys, key in self.configs_set:
self.fs.clear_ceph_conf(subsys, key)