summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Durgin <josh.durgin@inktank.com>2013-02-25 15:55:36 -0800
committerJosh Durgin <josh.durgin@inktank.com>2013-02-25 15:56:00 -0800
commit345aa2df547d6262a3f0c7c6f839ce8442841e10 (patch)
treea3e6bf927f4de25884d0c50a39feed16f63e11f8
parent2b7deeea2e9b5794d6e7df5efe75c6b6a9f7e1e7 (diff)
downloadceph-345aa2df547d6262a3f0c7c6f839ce8442841e10.tar.gz
test_rbd: close image before removing it
This error was masked before by watch notify not differentiating between watches from the same client with different cookies. Reopen the image at the end of this test so teardown works. Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
-rw-r--r--src/test/pybind/test_rbd.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py
index a03f14ee101..fbcd3f78040 100644
--- a/src/test/pybind/test_rbd.py
+++ b/src/test/pybind/test_rbd.py
@@ -587,6 +587,7 @@ class TestClone(object):
global features
self.image.set_snap('snap1')
eq(self.image.list_children(), [('rbd', 'clone')])
+ self.clone.close()
self.rbd.remove(ioctx, 'clone')
eq(self.image.list_children(), [])
@@ -604,6 +605,7 @@ class TestClone(object):
eq(self.image.list_children(), [])
self.rbd.clone(ioctx, IMG_NAME, 'snap1', ioctx, 'clone', features)
eq(self.image.list_children(), [('rbd', 'clone')])
+ self.clone = Image(ioctx, 'clone')
class TestFlatten(TestClone):