From 2d64d090c05be7792c934d8a3e060e48e68da129 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 5 Sep 2017 21:37:16 -0400 Subject: [PATCH] test/cls_rbd: mask newer feature bits to support upgrade tests Fixes: http://tracker.ceph.com/issues/21217 Signed-off-by: Jason Dillaman (cherry picked from commit aeb8f29d21625f3570e2f3e6dd26594d1a6df810) --- src/test/cls_rbd/test_cls_rbd.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc index f003882b66bda..2acd4ae8cbcc1 100644 --- a/src/test/cls_rbd/test_cls_rbd.cc +++ b/src/test/cls_rbd/test_cls_rbd.cc @@ -98,7 +98,8 @@ TEST_F(TestClsRbd, get_all_features) uint64_t all_features = 0; ASSERT_EQ(0, get_all_features(&ioctx, oid, &all_features)); - ASSERT_EQ(RBD_FEATURES_ALL, all_features); + ASSERT_EQ(static_cast(RBD_FEATURES_ALL), + static_cast(all_features & RBD_FEATURES_ALL)); ioctx.close(); } -- 2.39.5