From: John Spray <john.spray@redhat.com>
Date: Mon, 22 May 2017 23:04:05 +0000 (-0400)
Subject: qa: refine assert_session_count (don't count killing)
X-Git-Tag: v12.1.0~465^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3913ed0ba6d31c81d19016331ede1571cbd4b0be;p=ceph-ci.git

qa: refine assert_session_count (don't count killing)

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/qa/tasks/cephfs/cephfs_test_case.py b/qa/tasks/cephfs/cephfs_test_case.py
index ce21fab0d25..3f03b1d3e3c 100644
--- a/qa/tasks/cephfs/cephfs_test_case.py
+++ b/qa/tasks/cephfs/cephfs_test_case.py
@@ -193,8 +193,10 @@ class CephFSTestCase(CephTestCase):
         if ls_data is None:
             ls_data = self.fs.mds_asok(['session', 'ls'], mds_id=mds_id)
 
-        self.assertEqual(expected, len(ls_data), "Expected {0} sessions, found {1}".format(
-            expected, len(ls_data)
+        alive_count = len([s for s in ls_data if s['state'] != 'killing'])
+
+        self.assertEqual(expected, alive_count, "Expected {0} sessions, found {1}".format(
+            expected, alive_count
         ))
 
     def assert_session_state(self, client_id,  expected_state):