RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 01:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1720 from jdurgin/wip-list-children-test

Browse Source 
test_rbd.py: ignore children in cache pools

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2014-04-23 17:23:12 -07:00
commit d384d3a660
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/pybind/test_rbd.py
View File

@ -699,11 +699,18 @@ class TestClone(object):
parent_data = self.image.read(IMG_SIZE / 2 + 256, 256)
eq(parent_data, '\0' * 256)
def check_children(self, expected):
actual = self.image.list_children()
# dedup for cache pools until
# http://tracker.ceph.com/issues/8187 is fixed
deduped = set([('rbd', image[1]) for image in actual])
eq(deduped, set(expected))
def test_list_children(self):
global ioctx
global features
self.image.set_snap('snap1')
eq(self.image.list_children(), [('rbd', 'clone')])
self.check_children([('rbd', 'clone')])
self.clone.close()
self.rbd.remove(ioctx, 'clone')
eq(self.image.list_children(), [])
@ -712,16 +719,16 @@ class TestClone(object):
for i in xrange(10):
self.rbd.clone(ioctx, IMG_NAME, 'snap1', ioctx, 'clone%d' % i, features)
expected_children.append(('rbd', 'clone%d' % i))
eq(self.image.list_children(), expected_children)
self.check_children(expected_children)
for i in xrange(10):
self.rbd.remove(ioctx, 'clone%d' % i)
expected_children.pop(0)
eq(self.image.list_children(), expected_children)
self.check_children(expected_children)
eq(self.image.list_children(), [])
self.rbd.clone(ioctx, IMG_NAME, 'snap1', ioctx, 'clone', features)
eq(self.image.list_children(), [('rbd', 'clone')])
self.check_children([('rbd', 'clone')])
self.clone = Image(ioctx, 'clone')
def test_flatten_errors(self):