Improve test by getting cloneid from my_snaps vector

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Sam Just <sam.just@inktank.com>

diff --git a/src/test/librados/snapshots.cc b/src/test/librados/snapshots.cc
index b084aa1f82f5c132c452f020c43395e134757e9c..63e9bb0a6924ed6f59e1268da616f67d4bfad15a 100644 (file)
--- 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());