From 3913ed0ba6d31c81d19016331ede1571cbd4b0be Mon Sep 17 00:00:00 2001 From: John Spray Date: Mon, 22 May 2017 19:04:05 -0400 Subject: [PATCH] qa: refine assert_session_count (don't count killing) Signed-off-by: John Spray --- qa/tasks/cephfs/cephfs_test_case.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephfs/cephfs_test_case.py b/qa/tasks/cephfs/cephfs_test_case.py index ce21fab0d25d..3f03b1d3e3c4 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): -- 2.47.3