From: David Zafman <david.zafman@inktank.com>
Date: Thu, 14 Mar 2013 20:40:54 +0000 (-0700)
Subject: rados/test.sh fails in the nightly run
X-Git-Tag: v0.60~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=18525ebf5517d2ea4a16b7d405a37b706688a265;p=ceph.git

rados/test.sh fails in the nightly run

Make test more robust by using my_snaps vector for snap IDs

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

diff --git a/src/test/librados/snapshots.cc b/src/test/librados/snapshots.cc
index 1aec45456ba..b084aa1f82f 100644
--- a/src/test/librados/snapshots.cc
+++ b/src/test/librados/snapshots.cc
@@ -337,6 +337,7 @@ TEST(LibRadosSnapshots, SelfManagedSnapRollbackPP) {
   ASSERT_EQ(1u, ss.clones.size());
   ASSERT_EQ(head, ss.clones[0].cloneid);
   ASSERT_EQ(1u, ss.clones[0].snaps.size());	//this could go away in the future
+  ASSERT_EQ(my_snaps[0], ss.clones[0].snaps[0]);
   ASSERT_EQ(0u, ss.clones[0].overlap.size());
   ASSERT_EQ(384u, ss.clones[0].size);
 
@@ -358,8 +359,8 @@ TEST(LibRadosSnapshots, SelfManagedSnapRollbackPP) {
   ASSERT_EQ(2u, ss.clones.size());
   ASSERT_EQ(3u, ss.clones[0].cloneid);
   ASSERT_EQ(2u, ss.clones[0].snaps.size());
-  ASSERT_EQ(2u, ss.clones[0].snaps[0]);	//this could go away in the future
-  ASSERT_EQ(3u, ss.clones[0].snaps[1]);
+  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(2u, ss.clones[0].overlap.size());
   ASSERT_EQ(0u, ss.clones[0].overlap[0].first);
   ASSERT_EQ(128u, ss.clones[0].overlap[0].second);
@@ -419,7 +420,7 @@ TEST(LibRadosSnapshots, SelfManagedSnapOverlapPP) {
   ASSERT_EQ(1u, ss.clones.size());
   ASSERT_EQ(head, ss.clones[0].cloneid);
   ASSERT_EQ(1u, ss.clones[0].snaps.size());
-  ASSERT_EQ(2u, ss.clones[0].snaps[0]);	//this could go away in the future
+  ASSERT_EQ(my_snaps[0], ss.clones[0].snaps[0]);	//this could go away in the future
   ASSERT_EQ(0u, ss.clones[0].overlap.size());
   ASSERT_EQ(1152u, ss.clones[0].size);
 
@@ -442,8 +443,8 @@ TEST(LibRadosSnapshots, SelfManagedSnapOverlapPP) {
   ASSERT_EQ(2u, ss.clones.size());
   ASSERT_EQ(3u, ss.clones[0].cloneid);
   ASSERT_EQ(2u, ss.clones[0].snaps.size());
-  ASSERT_EQ(2u, ss.clones[0].snaps[0]);	//this could go away in the future
-  ASSERT_EQ(3u, ss.clones[0].snaps[1]);
+  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(5u, ss.clones[0].overlap.size());
   ASSERT_EQ(0u, ss.clones[0].overlap[0].first);
   ASSERT_EQ(128u, ss.clones[0].overlap[0].second);
@@ -480,8 +481,8 @@ TEST(LibRadosSnapshots, SelfManagedSnapOverlapPP) {
   ASSERT_EQ(3u, ss.clones.size());
   ASSERT_EQ(3u, ss.clones[0].cloneid);
   ASSERT_EQ(2u, ss.clones[0].snaps.size());
-  ASSERT_EQ(2u, ss.clones[0].snaps[0]);	//this could go away in the future
-  ASSERT_EQ(3u, ss.clones[0].snaps[1]);
+  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(5u, ss.clones[0].overlap.size());
   ASSERT_EQ(0u, ss.clones[0].overlap[0].first);
   ASSERT_EQ(128u, ss.clones[0].overlap[0].second);
@@ -497,7 +498,7 @@ TEST(LibRadosSnapshots, SelfManagedSnapOverlapPP) {
 
   ASSERT_EQ(4u, ss.clones[1].cloneid);
   ASSERT_EQ(1u, ss.clones[1].snaps.size());
-  ASSERT_EQ(4u, ss.clones[1].snaps[0]);
+  ASSERT_EQ(my_snaps[2], ss.clones[1].snaps[0]);
   ASSERT_EQ(4u, ss.clones[1].overlap.size());
   ASSERT_EQ(0u, ss.clones[1].overlap[0].first);
   ASSERT_EQ(128u, ss.clones[1].overlap[0].second);