summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zafman <david.zafman@inktank.com>2013-03-22 18:14:10 -0700
committerDavid Zafman <david.zafman@inktank.com>2013-03-22 18:14:10 -0700
commit8d21b0a9ae20e6d3bfec04530fe4906edfd0dd2a (patch)
treed79bfc74095b689a53bd2d099dd6e5479e22dabe
parent16063db20e24d443aa38a04aae0f470df0d7693c (diff)
downloadceph-8d21b0a9ae20e6d3bfec04530fe4906edfd0dd2a.tar.gz
Improve test by getting cloneid from my_snaps vectorwip-snap-test-fix
Signed-off-by: David Zafman <david.zafman@inktank.com>
-rw-r--r--src/test/librados/snapshots.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/librados/snapshots.cc b/src/test/librados/snapshots.cc
index b084aa1f82f..63e9bb0a692 100644
--- a/src/test/librados/snapshots.cc
+++ b/src/test/librados/snapshots.cc
@@ -357,7 +357,7 @@ TEST(LibRadosSnapshots, SelfManagedSnapRollbackPP) {
ASSERT_EQ(0, ioctx.list_snaps("foo", &ss));
ASSERT_EQ(2u, ss.clones.size());
- ASSERT_EQ(3u, ss.clones[0].cloneid);
+ ASSERT_EQ(my_snaps[1], ss.clones[0].cloneid);
ASSERT_EQ(2u, ss.clones[0].snaps.size());
ASSERT_EQ(my_snaps[0], ss.clones[0].snaps[0]); //this could go away in the future
ASSERT_EQ(my_snaps[1], ss.clones[0].snaps[1]);
@@ -441,7 +441,7 @@ TEST(LibRadosSnapshots, SelfManagedSnapOverlapPP) {
ASSERT_EQ(0, ioctx.list_snaps("foo", &ss));
ASSERT_EQ(2u, ss.clones.size());
- ASSERT_EQ(3u, ss.clones[0].cloneid);
+ ASSERT_EQ(my_snaps[1], ss.clones[0].cloneid);
ASSERT_EQ(2u, ss.clones[0].snaps.size());
ASSERT_EQ(my_snaps[0], ss.clones[0].snaps[0]); //this could go away in the future
ASSERT_EQ(my_snaps[1], ss.clones[0].snaps[1]);
@@ -479,7 +479,7 @@ TEST(LibRadosSnapshots, SelfManagedSnapOverlapPP) {
ASSERT_EQ(0, ioctx.list_snaps("foo", &ss));
ASSERT_EQ(3u, ss.clones.size());
- ASSERT_EQ(3u, ss.clones[0].cloneid);
+ ASSERT_EQ(my_snaps[1], ss.clones[0].cloneid);
ASSERT_EQ(2u, ss.clones[0].snaps.size());
ASSERT_EQ(my_snaps[0], ss.clones[0].snaps[0]); //this could go away in the future
ASSERT_EQ(my_snaps[1], ss.clones[0].snaps[1]);
@@ -496,7 +496,7 @@ TEST(LibRadosSnapshots, SelfManagedSnapOverlapPP) {
ASSERT_EQ(128u, ss.clones[0].overlap[4].second);
ASSERT_EQ(1152u, ss.clones[0].size);
- ASSERT_EQ(4u, ss.clones[1].cloneid);
+ ASSERT_EQ(my_snaps[2], ss.clones[1].cloneid);
ASSERT_EQ(1u, ss.clones[1].snaps.size());
ASSERT_EQ(my_snaps[2], ss.clones[1].snaps[0]);
ASSERT_EQ(4u, ss.clones[1].overlap.size());