From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 6 Sep 2017 01:37:16 +0000 (-0400)
Subject: test/cls_rbd: mask newer feature bits to support upgrade tests
X-Git-Tag: v10.2.10~40^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17552%2Fhead;p=ceph.git

test/cls_rbd: mask newer feature bits to support upgrade tests

Fixes: http://tracker.ceph.com/issues/21217
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit aeb8f29d21625f3570e2f3e6dd26594d1a6df810)
---

diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc
index f003882b66bd..2acd4ae8cbcc 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<uint64_t>(RBD_FEATURES_ALL),
+            static_cast<uint64_t>(all_features & RBD_FEATURES_ALL));
 
   ioctx.close();
 }