]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: relax cap expected value check 18041/head
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 29 Sep 2017 15:48:14 +0000 (08:48 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 29 Sep 2017 15:48:14 +0000 (08:48 -0700)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
qa/tasks/cephfs/test_client_limits.py

index 14ac2c4082666a4db834309f7873eec434a5ea03..cb5e3a4625243510d5216f94234b7d60e65b1f74 100644 (file)
@@ -84,13 +84,14 @@ class TestClientLimits(CephFSTestCase):
 
         # The remaining caps should comply with the numbers sent from MDS in SESSION_RECALL message,
         # which depend on the caps outstanding, cache size and overall ratio
+        recall_expected_value = int((1.0-mds_max_ratio_caps_per_client)*(open_files+2))
         def expected_caps():
             num_caps = self.get_session(mount_a_client_id)['num_caps']
             if num_caps < mds_min_caps_per_client:
-                raise
+                raise RuntimeError("client caps fell below min!")
             elif num_caps == mds_min_caps_per_client:
                 return True
-            elif num_caps == int((1.0-mds_max_ratio_caps_per_client)*(open_files+2)):
+            elif recall_expected_value*.95 <= num_caps <= recall_expected_value*1.05:
                 return True
             else:
                 return False