]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_test_rados_api_misc: do not assert rbd feature match 3411/head
authorSage Weil <sage@redhat.com>
Tue, 20 Jan 2015 02:28:20 +0000 (18:28 -0800)
committerSage Weil <sage@redhat.com>
Tue, 20 Jan 2015 02:28:20 +0000 (18:28 -0800)
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>
src/test/librados/misc.cc

index f4a291d2c35117b2b6276f93d51a4c377e9bb877..59f5d9f42db73d7fe421f7d2bae631b0d727c971 100644 (file)
@@ -321,7 +321,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) {
@@ -333,7 +334,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) {