From: Sage Weil <sage@redhat.com>
Date: Tue, 20 Jan 2015 02:28:20 +0000 (-0800)
Subject: ceph_test_rados_api_misc: do not assert rbd feature match
X-Git-Tag: v0.80.9~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8ba48d10c252b28cde5b4da1286421db12b57cc2;p=ceph.git

ceph_test_rados_api_misc: do not assert rbd feature match

This test fails on upgrades when we (or the server) have new
features.  Make it less fragile.

Fixes: #10576
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9147c62989871cea8b3a85b02c53017825efb55b)
---

diff --git a/src/test/librados/misc.cc b/src/test/librados/misc.cc
index ea990b50a98c..38443ce11466 100644
--- a/src/test/librados/misc.cc
+++ b/src/test/librados/misc.cc
@@ -299,7 +299,8 @@ TEST_F(LibRadosMisc, Exec) {
   bufferlist::iterator iter = bl.begin();
   uint64_t all_features;
   ::decode(all_features, iter);
-  ASSERT_EQ(all_features, (uint64_t)RBD_FEATURES_ALL);
+  // make sure *some* features are specified; don't care which ones
+  ASSERT_NE(all_features, 0);
 }
 
 TEST_F(LibRadosMiscPP, ExecPP) {
@@ -311,7 +312,8 @@ TEST_F(LibRadosMiscPP, ExecPP) {
   bufferlist::iterator iter = out.begin();
   uint64_t all_features;
   ::decode(all_features, iter);
-  ASSERT_EQ(all_features, (uint64_t)RBD_FEATURES_ALL);
+  // make sure *some* features are specified; don't care which ones
+  ASSERT_NE(all_features, 0);
 }
 
 TEST_F(LibRadosMiscPP, Operate1PP) {