summaryrefslogtreecommitdiff
path: root/src/test/rados-api
diff options
context:
space:
mode:
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>2011-08-19 09:51:04 -0700
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>2011-08-19 09:51:30 -0700
commite759021b9bee8f662dc6ab49dcac39df4d9e4604 (patch)
tree370e28e0011ccc9abda1ea87fa19aea3de60469b /src/test/rados-api
parentf0ab8b06f1358fa5c4da4b88e9f2ba66f1419259 (diff)
downloadceph-e759021b9bee8f662dc6ab49dcac39df4d9e4604.tar.gz
test/rados-api/misc.cc: update tests after API change
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Diffstat (limited to 'src/test/rados-api')
-rw-r--r--src/test/rados-api/misc.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/rados-api/misc.cc b/src/test/rados-api/misc.cc
index 356283af5f9..afc10d42240 100644
--- a/src/test/rados-api/misc.cc
+++ b/src/test/rados-api/misc.cc
@@ -162,7 +162,7 @@ TEST(LibRadosMisc, Operate1PP) {
IoCtx ioctx;
cluster.ioctx_create(pool_name.c_str(), ioctx);
- ObjectOperation o;
+ ObjectWriteOperation o;
{
bufferlist bl;
o.write(0, bl);
@@ -179,19 +179,19 @@ TEST(LibRadosMisc, Operate1PP) {
ASSERT_GT(ioctx.getxattr("foo", "key1", bl), 0);
ASSERT_EQ(0, strcmp(bl.c_str(), val1.c_str()));
}
- ObjectOperation o2;
+ ObjectWriteOperation o2;
{
bufferlist bl;
bl.append(val1);
- o2.cmpxattr("key1", bl, CEPH_OSD_CMPXATTR_OP_EQ, CEPH_OSD_CMPXATTR_MODE_STRING);
+ o2.cmpxattr("key1", CEPH_OSD_CMPXATTR_OP_EQ, bl);
o2.rmxattr("key1");
}
ASSERT_EQ(1, ioctx.operate("foo", &o2));
- ObjectOperation o3;
+ ObjectWriteOperation o3;
{
bufferlist bl;
bl.append(val1);
- o3.cmpxattr("key1", bl, CEPH_OSD_CMPXATTR_OP_EQ, CEPH_OSD_CMPXATTR_MODE_STRING);
+ o3.cmpxattr("key1", CEPH_OSD_CMPXATTR_OP_EQ, bl);
}
ASSERT_LT(ioctx.operate("foo", &o3), 0);
ioctx.close();
@@ -205,7 +205,7 @@ TEST(LibRadosMisc, Operate2PP) {
IoCtx ioctx;
cluster.ioctx_create(pool_name.c_str(), ioctx);
- ObjectOperation o;
+ ObjectWriteOperation o;
{
bufferlist bl;
bl.append("abcdefg");
@@ -246,7 +246,7 @@ TEST(LibRadosMisc, AioOperatePP) {
AioCompletion *my_completion_null = NULL;
ASSERT_NE(my_completion, my_completion_null);
- ObjectOperation o;
+ ObjectWriteOperation o;
{
bufferlist bl;
o.write(0, bl);