Merge remote-tracking branch 'gh/wip-4252'

2 files changed, 7 insertions, 7 deletions

diff --git a/qa/workunits/rbd/test_librbd_python.sh b/qa/workunits/rbd/test_librbd_python.sh
index e975d17f503..0d89b369d02 100755
--- a/qa/workunits/rbd/test_librbd_python.sh
+++ b/qa/workunits/rbd/test_librbd_python.sh
@@ -4,5 +4,5 @@ CEPH_REF=${CEPH_REF:-master}
 #wget -q https://raw.github.com/ceph/ceph/$CEPH_REF/src/test/pybind/test_rbd.py
 wget -O test_rbd.py "https://ceph.com/git/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=src/test/pybind/test_rbd.py" || \
     wget -O test_rbd.py "https://ceph.com/git/?p=ceph.git;a=blob_plain;hb=ref/heads/$CEPH_REF;f=src/test/pybind/test_rbd.py"
-nosetests -v -e '.*test_remove_with_watcher' test_rbd
+nosetests -v test_rbd
 exit 0
diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py
index a03f14ee101..c8b399bbb24 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,10 +605,9 @@ 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):
-
-    def test_errors(self):
+    def test_flatten_errors(self):
         # test that we can't flatten a non-clone
         assert_raises(InvalidArgument, self.image.flatten)
 
@@ -647,11 +647,11 @@ class TestFlatten(TestClone):
             eq(clone.overlap(), 0)
         self.rbd.remove(ioctx, 'clone2')
 
-    def test_basic(self):
+    def test_flatten_basic(self):
         self.check_flatten_with_order(IMG_ORDER)
 
-    def test_smaller_order(self):
+    def test_flatten_smaller_order(self):
         self.check_flatten_with_order(IMG_ORDER - 2)
 
-    def test_larger_order(self):
+    def test_flatten_larger_order(self):
         self.check_flatten_with_order(IMG_ORDER + 2)