From: Sage Weil <sage@redhat.com>
Date: Mon, 10 Apr 2017 20:19:01 +0000 (-0400)
Subject: unittest_osd_types: minor fix to past_intervals tests
X-Git-Tag: v12.0.3~129^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9d791191355fa5e44020bc825edbc0120f834ae;p=ceph.git

unittest_osd_types: minor fix to past_intervals tests

Set [up_]primary to valid values (not that it is actually
relevant to the test!).

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/osd/types.cc b/src/test/osd/types.cc
index dd451dde5f2..aaf1b74b457 100644
--- a/src/test/osd/types.cc
+++ b/src/test/osd/types.cc
@@ -1693,7 +1693,7 @@ TEST_F(PITest, past_intervals_rep_no_subsets) {
     /* intervals  */
     { ival{{0,    2}, {0,    2}, 10, 20,  true, 0, 0}
     , ival{{   1, 2}, {   1, 2}, 21, 30,  true, 1, 1}
-    , ival{{0, 1   }, {0, 1   }, 31, 35,  true, 2, 2}
+    , ival{{0, 1   }, {0, 1   }, 31, 35,  true, 0, 0}
     },
     /* les        */ 5,
     /* min_peer   */ 1,
@@ -1716,7 +1716,7 @@ TEST_F(PITest, past_intervals_ec_no_subsets) {
     /* intervals  */
     { ival{{0, N, 2}, {0, N, 2}, 10, 20,  true, 0, 0}
     , ival{{N, 1, 2}, {N, 1, 2}, 21, 30,  true, 1, 1}
-    , ival{{0, 1, N}, {0, 1, N}, 31, 35,  true, 2, 2}
+    , ival{{0, 1, N}, {0, 1, N}, 31, 35,  true, 0, 0}
     },
     /* les        */ 5,
     /* min_peer   */ 2,
@@ -1739,7 +1739,7 @@ TEST_F(PITest, past_intervals_ec_no_subsets2) {
     /* intervals  */
     { ival{{N, 1, 2}, {N, 1, 2}, 10, 20,  true, 0, 0}
     , ival{{0, N, 2}, {0, N, 2}, 21, 30,  true, 1, 1}
-    , ival{{0, 3, N}, {0, 3, N}, 31, 35,  true, 2, 2}
+    , ival{{0, 3, N}, {0, 3, N}, 31, 35,  true, 0, 0}
     },
     /* les        */ 31,
     /* min_peer   */ 2,
@@ -1787,7 +1787,7 @@ TEST_F(PITest, past_intervals_ec_lost) {
     /* intervals  */
     { ival{{0, N, 2}, {0, N, 2}, 10, 20,  true, 0, 0}
     , ival{{N, 1, 2}, {N, 1, 2}, 21, 30,  true, 1, 1}
-    , ival{{0, 1, N}, {0, 1, N}, 31, 35,  true, 2, 2}
+    , ival{{0, 1, N}, {0, 1, N}, 31, 35,  true, 0, 0}
     },
     /* les        */ 5,
     /* min_peer   */ 2,