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

ceph_test_rados_api_*: expose RadosTest::nspace
Expose RadosTestEC::nspace
Rename others to nspace for consistency

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

diff --git a/src/test/librados/TestCase.cc b/src/test/librados/TestCase.cc
index 21124ce2251c..9d9668e90808 100644
--- a/src/test/librados/TestCase.cc
+++ b/src/test/librados/TestCase.cc
@@ -25,7 +25,7 @@ void RadosTest::SetUp()
 {
   cluster = RadosTest::s_cluster;
   ASSERT_EQ(0, rados_ioctx_create(cluster, pool_name.c_str(), &ioctx));
-  std::string nspace = get_temp_pool_name();
+  nspace = get_temp_pool_name();
   rados_ioctx_set_namespace(ioctx, nspace.c_str());
   ASSERT_FALSE(rados_ioctx_pool_requires_alignment(ioctx));
 }
@@ -71,8 +71,8 @@ void RadosTestPP::TearDownTestCase()
 void RadosTestPP::SetUp()
 {
   ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), ioctx));
-  ns = get_temp_pool_name();
-  ioctx.set_namespace(ns);
+  nspace = get_temp_pool_name();
+  ioctx.set_namespace(nspace);
   ASSERT_FALSE(ioctx.pool_requires_alignment());
 }
 
@@ -152,8 +152,8 @@ void RadosTestParamPP::SetUp()
   }
 
   ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), ioctx));
-  ns = get_temp_pool_name();
-  ioctx.set_namespace(ns);
+  nspace = get_temp_pool_name();
+  ioctx.set_namespace(nspace);
   ASSERT_FALSE(ioctx.pool_requires_alignment());
 }
 
@@ -193,7 +193,7 @@ void RadosTestEC::SetUp()
 {
   cluster = RadosTestEC::s_cluster;
   ASSERT_EQ(0, rados_ioctx_create(cluster, pool_name.c_str(), &ioctx));
-  std::string nspace = get_temp_pool_name();
+  nspace = get_temp_pool_name();
   rados_ioctx_set_namespace(ioctx, nspace.c_str());
   ASSERT_TRUE(rados_ioctx_pool_requires_alignment(ioctx));
   alignment = rados_ioctx_pool_required_alignment(ioctx);
@@ -223,8 +223,8 @@ void RadosTestECPP::TearDownTestCase()
 void RadosTestECPP::SetUp()
 {
   ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), ioctx));
-  ns = get_temp_pool_name();
-  ioctx.set_namespace(ns);
+  nspace = get_temp_pool_name();
+  ioctx.set_namespace(nspace);
   ASSERT_TRUE(ioctx.pool_requires_alignment());
   alignment = ioctx.pool_required_alignment();
   ASSERT_NE((unsigned)0, alignment);
diff --git a/src/test/librados/TestCase.h b/src/test/librados/TestCase.h
index 79b1465f8718..4d8484ac3748 100644
--- a/src/test/librados/TestCase.h
+++ b/src/test/librados/TestCase.h
@@ -33,6 +33,7 @@ protected:
   virtual void TearDown();
   rados_t cluster;
   rados_ioctx_t ioctx;
+  std::string nspace;
 };
 
 class RadosTestPP : public ::testing::Test {
@@ -50,7 +51,7 @@ protected:
   virtual void TearDown();
   librados::Rados &cluster;
   librados::IoCtx ioctx;
-  std::string ns;
+  std::string nspace;
 };
 
 class RadosTestParamPP : public ::testing::TestWithParam<const char*> {
@@ -69,7 +70,7 @@ protected:
   virtual void TearDown();
   librados::Rados &cluster;
   librados::IoCtx ioctx;
-  std::string ns;
+  std::string nspace;
 };
 
 class RadosTestEC : public RadosTest {
@@ -86,6 +87,7 @@ protected:
   virtual void TearDown();
   rados_t cluster;
   rados_ioctx_t ioctx;
+  std::string nspace;
   uint64_t alignment;
 };
 
@@ -103,8 +105,7 @@ protected:
   virtual void TearDown();
   librados::Rados &cluster;
   librados::IoCtx ioctx;
-  std::string ns;
+  std::string nspace;
   uint64_t alignment;
 };
-
 #endif
diff --git a/src/test/librados/snapshots.cc b/src/test/librados/snapshots.cc
index 020af111ddf9..e9c566a711d5 100644
--- a/src/test/librados/snapshots.cc
+++ b/src/test/librados/snapshots.cc
@@ -256,7 +256,7 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, RollbackPP) {
   std::vector<uint64_t> my_snaps;
   IoCtx readioctx;
   ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), readioctx));
-  readioctx.set_namespace(ns);
+  readioctx.set_namespace(nspace);
   readioctx.snap_set_read(LIBRADOS_SNAP_DIR);
 
   my_snaps.push_back(-2);
@@ -340,7 +340,7 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, SnapOverlapPP) {
   std::vector<uint64_t> my_snaps;
   IoCtx readioctx;
   ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), readioctx));
-  readioctx.set_namespace(ns);
+  readioctx.set_namespace(nspace);
   readioctx.snap_set_read(LIBRADOS_SNAP_DIR);
 
   my_snaps.push_back(-2);
@@ -714,7 +714,7 @@ TEST_F(LibRadosSnapshotsSelfManagedECPP, RollbackPP) {
   std::vector<uint64_t> my_snaps;
   IoCtx readioctx;
   ASSERT_EQ(0, cluster.ioctx_create(pool_name.c_str(), readioctx));
-  readioctx.set_namespace(ns);
+  readioctx.set_namespace(nspace);
   readioctx.snap_set_read(LIBRADOS_SNAP_DIR);
 
   my_snaps.push_back(-2);
diff --git a/src/test/librados/tier.cc b/src/test/librados/tier.cc
index eeb11254ab74..ef7d80b5f2af 100644
--- a/src/test/librados/tier.cc
+++ b/src/test/librados/tier.cc
@@ -87,7 +87,7 @@ protected:
   virtual void SetUp() {
     RadosTestPP::SetUp();
     ASSERT_EQ(0, cluster.ioctx_create(cache_pool_name.c_str(), cache_ioctx));
-    cache_ioctx.set_namespace(ns);
+    cache_ioctx.set_namespace(nspace);
   }
   virtual void TearDown() {
     RadosTestPP::TearDown();
@@ -2270,7 +2270,7 @@ protected:
   virtual void SetUp() {
     RadosTestECPP::SetUp();
     ASSERT_EQ(0, cluster.ioctx_create(cache_pool_name.c_str(), cache_ioctx));
-    cache_ioctx.set_namespace(ns);
+    cache_ioctx.set_namespace(nspace);
   }
   virtual void TearDown() {
     RadosTestECPP::TearDown();