From: David Zafman <dzafman@redhat.com>
Date: Wed, 10 Sep 2014 22:42:14 +0000 (-0700)
Subject: Revert "ceph_test_rados_api_*: expose nspace"
X-Git-Tag: v0.89~36^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e42fb5e8bd8e1ec164b74888a3f54410bb3e6e7b;p=ceph.git

Revert "ceph_test_rados_api_*: expose nspace"

This reverts commit 977d289055d69ab8a7baaf7ef68c013019225833.

The nspace string doesn't need to be static because it isn't
set by a static function.
---

diff --git a/src/test/librados/TestCase.cc b/src/test/librados/TestCase.cc
index 7f072fd850f3..21124ce2251c 100644
--- a/src/test/librados/TestCase.cc
+++ b/src/test/librados/TestCase.cc
@@ -8,7 +8,6 @@
 using namespace librados;
 
 std::string RadosTest::pool_name;
-std::string RadosTest::nspace;
 rados_t RadosTest::s_cluster = NULL;
 
 void RadosTest::SetUpTestCase()
@@ -26,7 +25,7 @@ void RadosTest::SetUp()
 {
   cluster = RadosTest::s_cluster;
   ASSERT_EQ(0, rados_ioctx_create(cluster, pool_name.c_str(), &ioctx));
-  nspace = get_temp_pool_name();
+  std::string nspace = get_temp_pool_name();
   rados_ioctx_set_namespace(ioctx, nspace.c_str());
   ASSERT_FALSE(rados_ioctx_pool_requires_alignment(ioctx));
 }
diff --git a/src/test/librados/TestCase.h b/src/test/librados/TestCase.h
index e8b7b9a30c99..79b1465f8718 100644
--- a/src/test/librados/TestCase.h
+++ b/src/test/librados/TestCase.h
@@ -28,7 +28,6 @@ protected:
   static void cleanup_default_namespace(rados_ioctx_t ioctx);
   static rados_t s_cluster;
   static std::string pool_name;
-  static std::string nspace;
 
   virtual void SetUp();
   virtual void TearDown();