From: Josh Durgin <josh.durgin@inktank.com>
Date: Tue, 18 Feb 2014 01:09:26 +0000 (-0800)
Subject: test/librados: remove unused lines and fix return code for cmp guards
X-Git-Tag: v0.78~154^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1256%2Fhead;p=ceph.git

test/librados: remove unused lines and fix return code for cmp guards

Now that return values are actually set by the osd and client, fix up
the tests that were checking the old behavior.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/src/test/librados/aio.cc b/src/test/librados/aio.cc
index 41318b87585..30c794a4abb 100644
--- a/src/test/librados/aio.cc
+++ b/src/test/librados/aio.cc
@@ -14,7 +14,6 @@
 using std::ostringstream;
 using namespace librados;
 using std::pair;
-using std::make_pair;
 
 class AioTestData
 {
@@ -1157,7 +1156,6 @@ TEST(LibRadosAio, OmapPP) {
   {
     boost::scoped_ptr<AioCompletion> my_completion(cluster.aio_create_completion(0, 0, 0));
     ObjectWriteOperation op;
-    string val = "bar";
     to_set["foo"] = header_to_set;
     to_set["foo2"] = header_to_set;
     to_set["qfoo3"] = header_to_set;
@@ -1188,7 +1186,7 @@ TEST(LibRadosAio, OmapPP) {
       TestAlarm alarm;
       ASSERT_EQ(0, my_completion->wait_for_complete());
     }
-    ASSERT_EQ(0, r);
+    ASSERT_EQ(-ECANCELED, r);
   }
 
   {
diff --git a/src/test/librados/misc.cc b/src/test/librados/misc.cc
index e8c0d2f3ab6..233cc6ba67a 100644
--- a/src/test/librados/misc.cc
+++ b/src/test/librados/misc.cc
@@ -344,14 +344,14 @@ TEST_F(LibRadosMiscPP, Operate1PP) {
     o2.cmpxattr("key1", CEPH_OSD_CMPXATTR_OP_EQ, bl);
     o2.rmxattr("key1");
   }
-  ASSERT_EQ(0, ioctx.operate("foo", &o2));
+  ASSERT_EQ(-ECANCELED, ioctx.operate("foo", &o2));
   ObjectWriteOperation o3;
   {
     bufferlist bl;
     bl.append(val1);
     o3.cmpxattr("key1", CEPH_OSD_CMPXATTR_OP_EQ, bl);
   }
-  ASSERT_LT(ioctx.operate("foo", &o3), 0);
+  ASSERT_EQ(-ECANCELED, ioctx.operate("foo", &o3));
 }
 
 TEST_F(LibRadosMiscPP, Operate2PP) {