]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa: refine assert_session_count (don't count killing)
authorJohn Spray <john.spray@redhat.com>
Mon, 22 May 2017 23:04:05 +0000 (19:04 -0400)
committerJohn Spray <john.spray@redhat.com>
Tue, 23 May 2017 09:22:18 +0000 (05:22 -0400)
Signed-off-by: John Spray <john.spray@redhat.com>
qa/tasks/cephfs/cephfs_test_case.py

index ce21fab0d25dcdd9bf4c15fbd9b1251bc8fd01c5..3f03b1d3e3c4ee244369a97c1e7b148afa9ce6fa 100644 (file)
@@ -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):