From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 31 Oct 2016 15:08:55 +0000 (-0400)
Subject: test: skip TestLibRBD.DiscardAfterWrite if skip partial discard enabled
X-Git-Tag: v11.1.0~466^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20406aef3e0bd442d17cbb7acf5db7c42a0d8a11;p=ceph.git

test: skip TestLibRBD.DiscardAfterWrite if skip partial discard enabled

Fixes: http://tracker.ceph.com/issues/17750
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc
index d4807da2419b..b95100c15a72 100644
--- a/src/test/librbd/test_librbd.cc
+++ b/src/test/librbd/test_librbd.cc
@@ -4983,6 +4983,9 @@ TEST_F(TestLibRBD, ExclusiveLock)
 
 TEST_F(TestLibRBD, DiscardAfterWrite)
 {
+  CephContext* cct = reinterpret_cast<CephContext*>(_rados.cct());
+  REQUIRE(!cct->_conf->rbd_skip_partial_discard);
+
   librados::IoCtx ioctx;
   ASSERT_EQ(0, _rados.ioctx_create(m_pool_name.c_str(), ioctx));