From: David Zafman <dzafman@redhat.com>
Date: Thu, 11 Sep 2014 02:19:08 +0000 (-0700)
Subject: test: Fix ceph_test_rados_watch_notify to delete the pools it creates
X-Git-Tag: v0.86~91^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2459%2Fhead;p=ceph.git

test: Fix ceph_test_rados_watch_notify to delete the pools it creates

Fixes: #7934

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/test/system/rados_watch_notify.cc b/src/test/system/rados_watch_notify.cc
index 6517f33ebe82..5a081ee3da1f 100644
--- a/src/test/system/rados_watch_notify.cc
+++ b/src/test/system/rados_watch_notify.cc
@@ -73,10 +73,12 @@ int main(int argc, const char **argv)
 		    1, 0, pool, "0.obj");
     StRadosNotify r3(argc, argv, setup_sem, watch_sem, notify_sem,
 		     0, pool, "0.obj");
+    StRadosDeletePool r4(argc, argv, notify_sem, NULL, pool);
     vector<SysTestRunnable*> vec;
     vec.push_back(&r1);
     vec.push_back(&r2);
     vec.push_back(&r3);
+    vec.push_back(&r4);
     std::string error = SysTestRunnable::run_until_finished(vec);
     if (!error.empty()) {
       printf("test1: got error: %s\n", error.c_str());
@@ -97,10 +99,12 @@ int main(int argc, const char **argv)
 		    0, -ENOENT, pool, "0.obj");
     StRadosNotify r3(argc, argv, setup_sem, watch_sem, notify_sem,
 		     -ENOENT, pool, "0.obj");
+    StRadosDeletePool r4(argc, argv, notify_sem, NULL, pool);
     vector<SysTestRunnable*> vec;
     vec.push_back(&r1);
     vec.push_back(&r2);
     vec.push_back(&r3);
+    vec.push_back(&r4);
     std::string error = SysTestRunnable::run_until_finished(vec);
     if (!error.empty()) {
       printf("test2: got error: %s\n", error.c_str());
@@ -171,6 +175,7 @@ int main(int argc, const char **argv)
     StRadosDeleteObjs r4(argc, argv, notify_sem, deleted_sem, 1, pool, ".obj");
     StRadosNotify r5(argc, argv, setup_sem, deleted_sem, finished_notifies_sem,
 		     -ENOENT, pool, "0.obj");
+    StRadosDeletePool r6(argc, argv, finished_notifies_sem, NULL, pool);
 
     vector<SysTestRunnable*> vec;
     vec.push_back(&r1);
@@ -178,6 +183,7 @@ int main(int argc, const char **argv)
     vec.push_back(&r3);
     vec.push_back(&r4);
     vec.push_back(&r5);
+    vec.push_back(&r6);
     std::string error = SysTestRunnable::run_until_finished(vec);
     if (!error.empty()) {
       printf("test4: got error: %s\n", error.c_str());