librados: Fixes to list_snaps test changes

Add back assert for overlap
Fix snap size and remove unnecessary comments
Fix failing test cases

Signed-off-by: David Zafman <david.zafman@inktank.com>

diff --git a/src/test/librados/snapshots.cc b/src/test/librados/snapshots.cc
index 0cc6bb2e9a726a6c88bee669c9373550759db480..fc83cf1f81ea7789086ca946e949d27d5736ddf7 100644 (file)
--- a/src/test/librados/snapshots.cc
+++ b/src/test/librados/snapshots.cc
@@ -339,7 +339,8 @@ TEST(LibRadosSnapshots, SelfManagedSnapRollbackPP) {
   ASSERT_EQ(0, readioctx.list_snaps("foo", &ss));
   ASSERT_EQ(1u, ss.clones.size());
   ASSERT_EQ(head, ss.clones[0].cloneid);
-  ASSERT_EQ(0u, ss.clones[0].snaps.size());    //this could go away in the future
+  ASSERT_EQ(0u, ss.clones[0].snaps.size());
+  ASSERT_EQ(0u, ss.clones[0].overlap.size());
   ASSERT_EQ(384u, ss.clones[0].size);
 
   my_snaps.push_back(-2);
@@ -427,8 +428,7 @@ TEST(LibRadosSnapshots, SelfManagedSnapOverlapPP) {
   ASSERT_EQ(0, readioctx.list_snaps("foo", &ss));
   ASSERT_EQ(1u, ss.clones.size());
   ASSERT_EQ(head, ss.clones[0].cloneid);
-  ASSERT_EQ(1u, ss.clones[0].snaps.size());
-  ASSERT_EQ(my_snaps[0], ss.clones[0].snaps[0]);       //this could go away in the future
+  ASSERT_EQ(0u, ss.clones[0].snaps.size());
   ASSERT_EQ(0u, ss.clones[0].overlap.size());
   ASSERT_EQ(1152u, ss.clones[0].size);
 
@@ -450,9 +450,8 @@ TEST(LibRadosSnapshots, SelfManagedSnapOverlapPP) {
   ASSERT_EQ(0, readioctx.list_snaps("foo", &ss));
   ASSERT_EQ(2u, ss.clones.size());
   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]);
+  ASSERT_EQ(1u, ss.clones[0].snaps.size());
+  ASSERT_EQ(my_snaps[1], ss.clones[0].snaps[0]);
   ASSERT_EQ(5u, ss.clones[0].overlap.size());
   ASSERT_EQ(0u, ss.clones[0].overlap[0].first);
   ASSERT_EQ(128u, ss.clones[0].overlap[0].second);
@@ -488,9 +487,8 @@ TEST(LibRadosSnapshots, SelfManagedSnapOverlapPP) {
   ASSERT_EQ(0, readioctx.list_snaps("foo", &ss));
   ASSERT_EQ(3u, ss.clones.size());
   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]);
+  ASSERT_EQ(1u, ss.clones[0].snaps.size());
+  ASSERT_EQ(my_snaps[1], ss.clones[0].snaps[0]);
   ASSERT_EQ(5u, ss.clones[0].overlap.size());
   ASSERT_EQ(0u, ss.clones[0].overlap[0].first);
   ASSERT_EQ(128u, ss.clones[0].overlap[0].second);