From 59b6801976989b17532c209b65b5b53b4cf2dee0 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 11 Mar 2015 16:18:16 -0400 Subject: [PATCH] tests: update cls_rbd_client tests for get_features changes Images no longer track per-snapshot features. snapshot_list no longer needs to retrieve per-snapshot features. Signed-off-by: Jason Dillaman --- src/test/cls_rbd/test_cls_rbd.cc | 46 +++++++++----------------------- 1 file changed, 12 insertions(+), 34 deletions(-) diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc index e00290a66c62c..025c3f6a10223 100644 --- a/src/test/cls_rbd/test_cls_rbd.cc +++ b/src/test/cls_rbd/test_cls_rbd.cc @@ -366,7 +366,8 @@ TEST_F(TestClsRbd, get_features) ASSERT_EQ(0, get_features(&ioctx, oid, CEPH_NOSNAP, &features)); ASSERT_EQ(0u, features); - ASSERT_EQ(-ENOENT, get_features(&ioctx, oid, 1, &features)); + ASSERT_EQ(0, get_features(&ioctx, oid, 1, &features)); + ASSERT_EQ(0u, features); ioctx.close(); } @@ -680,7 +681,6 @@ TEST_F(TestClsRbd, snapshots) vector snap_names; vector snap_sizes; - vector snap_features; SnapContext snapc; vector parents; vector protection_status; @@ -689,11 +689,9 @@ TEST_F(TestClsRbd, snapshots) ASSERT_EQ(0u, snapc.snaps.size()); ASSERT_EQ(0u, snapc.seq); ASSERT_EQ(0, snapshot_list(&ioctx, oid, snapc.snaps, &snap_names, - &snap_sizes, &snap_features, &parents, - &protection_status)); + &snap_sizes, &parents, &protection_status)); ASSERT_EQ(0u, snap_names.size()); ASSERT_EQ(0u, snap_sizes.size()); - ASSERT_EQ(0u, snap_features.size()); ASSERT_EQ(0, snapshot_add(&ioctx, oid, 0, "snap1")); ASSERT_EQ(0, get_snapcontext(&ioctx, oid, &snapc)); @@ -701,12 +699,10 @@ TEST_F(TestClsRbd, snapshots) ASSERT_EQ(0u, snapc.snaps[0]); ASSERT_EQ(0u, snapc.seq); ASSERT_EQ(0, snapshot_list(&ioctx, oid, snapc.snaps, &snap_names, - &snap_sizes, &snap_features, &parents, - &protection_status)); + &snap_sizes, &parents, &protection_status)); ASSERT_EQ(1u, snap_names.size()); ASSERT_EQ("snap1", snap_names[0]); ASSERT_EQ(10u, snap_sizes[0]); - ASSERT_EQ(0u, snap_features[0]); // snap with same id and name ASSERT_EQ(-EEXIST, snapshot_add(&ioctx, oid, 0, "snap1")); @@ -715,12 +711,10 @@ TEST_F(TestClsRbd, snapshots) ASSERT_EQ(0u, snapc.snaps[0]); ASSERT_EQ(0u, snapc.seq); ASSERT_EQ(0, snapshot_list(&ioctx, oid, snapc.snaps, &snap_names, - &snap_sizes, &snap_features, &parents, - &protection_status)); + &snap_sizes, &parents, &protection_status)); ASSERT_EQ(1u, snap_names.size()); ASSERT_EQ("snap1", snap_names[0]); ASSERT_EQ(10u, snap_sizes[0]); - ASSERT_EQ(0u, snap_features[0]); // snap with same id, different name ASSERT_EQ(-EEXIST, snapshot_add(&ioctx, oid, 0, "snap2")); @@ -729,12 +723,10 @@ TEST_F(TestClsRbd, snapshots) ASSERT_EQ(0u, snapc.snaps[0]); ASSERT_EQ(0u, snapc.seq); ASSERT_EQ(0, snapshot_list(&ioctx, oid, snapc.snaps, &snap_names, - &snap_sizes, &snap_features, &parents, - &protection_status)); + &snap_sizes, &parents, &protection_status)); ASSERT_EQ(1u, snap_names.size()); ASSERT_EQ("snap1", snap_names[0]); ASSERT_EQ(10u, snap_sizes[0]); - ASSERT_EQ(0u, snap_features[0]); // snap with different id, same name ASSERT_EQ(-EEXIST, snapshot_add(&ioctx, oid, 1, "snap1")); @@ -743,12 +735,10 @@ TEST_F(TestClsRbd, snapshots) ASSERT_EQ(0u, snapc.snaps[0]); ASSERT_EQ(0u, snapc.seq); ASSERT_EQ(0, snapshot_list(&ioctx, oid, snapc.snaps, &snap_names, - &snap_sizes, &snap_features, &parents, - &protection_status)); + &snap_sizes, &parents, &protection_status)); ASSERT_EQ(snap_names.size(), 1u); ASSERT_EQ(snap_names[0], "snap1"); ASSERT_EQ(snap_sizes[0], 10u); - ASSERT_EQ(snap_features[0], 0u); // snap with different id, different name ASSERT_EQ(0, snapshot_add(&ioctx, oid, 1, "snap2")); @@ -758,15 +748,12 @@ TEST_F(TestClsRbd, snapshots) ASSERT_EQ(0u, snapc.snaps[1]); ASSERT_EQ(1u, snapc.seq); ASSERT_EQ(0, snapshot_list(&ioctx, oid, snapc.snaps, &snap_names, - &snap_sizes, &snap_features, &parents, - &protection_status)); + &snap_sizes, &parents, &protection_status)); ASSERT_EQ(2u, snap_names.size()); ASSERT_EQ("snap2", snap_names[0]); ASSERT_EQ(10u, snap_sizes[0]); - ASSERT_EQ(0u, snap_features[0]); ASSERT_EQ("snap1", snap_names[1]); ASSERT_EQ(10u, snap_sizes[1]); - ASSERT_EQ(0u, snap_features[1]); ASSERT_EQ(0, snapshot_remove(&ioctx, oid, 0)); ASSERT_EQ(0, get_snapcontext(&ioctx, oid, &snapc)); @@ -774,12 +761,10 @@ TEST_F(TestClsRbd, snapshots) ASSERT_EQ(1u, snapc.snaps[0]); ASSERT_EQ(1u, snapc.seq); ASSERT_EQ(0, snapshot_list(&ioctx, oid, snapc.snaps, &snap_names, - &snap_sizes, &snap_features, &parents, - &protection_status)); + &snap_sizes, &parents, &protection_status)); ASSERT_EQ(1u, snap_names.size()); ASSERT_EQ("snap2", snap_names[0]); ASSERT_EQ(10u, snap_sizes[0]); - ASSERT_EQ(0u, snap_features[0]); uint64_t size; uint8_t order; @@ -796,15 +781,12 @@ TEST_F(TestClsRbd, snapshots) ASSERT_EQ(1u, snapc.snaps[1]); ASSERT_EQ(large_snap_id, snapc.seq); ASSERT_EQ(0, snapshot_list(&ioctx, oid, snapc.snaps, &snap_names, - &snap_sizes, &snap_features, &parents, - &protection_status)); + &snap_sizes, &parents, &protection_status)); ASSERT_EQ(2u, snap_names.size()); ASSERT_EQ("snap3", snap_names[0]); ASSERT_EQ(0u, snap_sizes[0]); - ASSERT_EQ(0u, snap_features[0]); ASSERT_EQ("snap2", snap_names[1]); ASSERT_EQ(10u, snap_sizes[1]); - ASSERT_EQ(0u, snap_features[1]); ASSERT_EQ(0, get_size(&ioctx, oid, large_snap_id, &size, &order)); ASSERT_EQ(0u, size); @@ -820,12 +802,10 @@ TEST_F(TestClsRbd, snapshots) ASSERT_EQ(1u, snapc.snaps[0]); ASSERT_EQ(large_snap_id, snapc.seq); ASSERT_EQ(0, snapshot_list(&ioctx, oid, snapc.snaps, &snap_names, - &snap_sizes, &snap_features, &parents, - &protection_status)); + &snap_sizes, &parents, &protection_status)); ASSERT_EQ(1u, snap_names.size()); ASSERT_EQ("snap2", snap_names[0]); ASSERT_EQ(10u, snap_sizes[0]); - ASSERT_EQ(0u, snap_features[0]); ASSERT_EQ(-ENOENT, snapshot_remove(&ioctx, oid, large_snap_id)); ASSERT_EQ(0, snapshot_remove(&ioctx, oid, 1)); @@ -833,11 +813,9 @@ TEST_F(TestClsRbd, snapshots) ASSERT_EQ(0u, snapc.snaps.size()); ASSERT_EQ(large_snap_id, snapc.seq); ASSERT_EQ(0, snapshot_list(&ioctx, oid, snapc.snaps, &snap_names, - &snap_sizes, &snap_features, &parents, - &protection_status)); + &snap_sizes, &parents, &protection_status)); ASSERT_EQ(0u, snap_names.size()); ASSERT_EQ(0u, snap_sizes.size()); - ASSERT_EQ(0u, snap_features.size()); ioctx.close(); } -- 2.39.5