From 9147c62989871cea8b3a85b02c53017825efb55b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 19 Jan 2015 18:28:20 -0800 Subject: [PATCH] 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 --- src/test/librados/misc.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/librados/misc.cc b/src/test/librados/misc.cc index f4a291d2c3511..59f5d9f42db73 100644 --- a/src/test/librados/misc.cc +++ b/src/test/librados/misc.cc @@ -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) { -- 2.47.3