From: Sage Weil <sage@redhat.com>
Date: Tue, 22 Jul 2014 13:53:41 +0000 (-0700)
Subject: ceph_test_objectstore: clean up on finish of MoveRename
X-Git-Tag: v0.80.6~103^2~2^2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8494c87e5276f0587c3341ddef9d7a933dfea11;p=ceph.git

ceph_test_objectstore: clean up on finish of MoveRename

Otherwise, we leave collections around, and the next test fails.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d4faf747b73e70dff9cb5c98ee6aaa4ecec215fc)
---

diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index cd34f6d804f9..7c5dc5830060 100644
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -1115,6 +1115,14 @@ TEST_P(StoreTest, MoveRename) {
     ASSERT_TRUE(newomap.count("omap_key"));
     ASSERT_TRUE(newomap["omap_key"].contents_equal(omap["omap_key"]));
   }
+  {
+    ObjectStore::Transaction t;
+    t.remove(cid, oid);
+    t.remove_collection(cid);
+    t.remove_collection(temp_cid);
+    r = store->apply_transaction(t);
+    ASSERT_EQ(r, 0);
+  }
 }
 
 TEST_P(StoreTest, BigRGWObjectName) {