From ea026df1e3cd10693d49b8f8c87758f95700818d Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 12 Sep 2019 17:42:17 -0700 Subject: [PATCH] qa: update json format from session listing Signed-off-by: Patrick Donnelly --- qa/tasks/cephfs/test_journal_repair.py | 4 ++-- qa/tasks/cephfs/test_sessionmap.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/tasks/cephfs/test_journal_repair.py b/qa/tasks/cephfs/test_journal_repair.py index 2c7e34e9978..a52455d7100 100644 --- a/qa/tasks/cephfs/test_journal_repair.py +++ b/qa/tasks/cephfs/test_journal_repair.py @@ -315,7 +315,7 @@ class TestJournalRepair(CephFSTestCase): # Should see one session session_data = json.loads(self.fs.table_tool( ["all", "show", "session"])) - self.assertEqual(len(session_data["0"]["data"]["Sessions"]), 1) + self.assertEqual(len(session_data["0"]["data"]["sessions"]), 1) self.assertEqual(session_data["0"]["result"], 0) # Should see no snaps @@ -344,7 +344,7 @@ class TestJournalRepair(CephFSTestCase): # Should see 0 sessions session_data = json.loads(self.fs.table_tool( ["all", "show", "session"])) - self.assertEqual(len(session_data["0"]["data"]["Sessions"]), 0) + self.assertEqual(len(session_data["0"]["data"]["sessions"]), 0) self.assertEqual(session_data["0"]["result"], 0) # Should see entire inode range now marked free diff --git a/qa/tasks/cephfs/test_sessionmap.py b/qa/tasks/cephfs/test_sessionmap.py index 5108d5d6ac8..a8d40dc6f70 100644 --- a/qa/tasks/cephfs/test_sessionmap.py +++ b/qa/tasks/cephfs/test_sessionmap.py @@ -106,7 +106,7 @@ class TestSessionMap(CephFSTestCase): table_json = json.loads(self.fs.table_tool(["0", "show", "session"])) log.info("SessionMap: {0}".format(json.dumps(table_json, indent=2))) self.assertEqual(table_json['0']['result'], 0) - self.assertEqual(len(table_json['0']['data']['Sessions']), 2) + self.assertEqual(len(table_json['0']['data']['sessions']), 2) # Now, induce a "force_open_sessions" event by exporting a dir self.mount_a.run_shell(["mkdir", "bravo"]) @@ -147,7 +147,7 @@ class TestSessionMap(CephFSTestCase): table_json = json.loads(self.fs.table_tool(["0", "show", "session"])) log.info("SessionMap: {0}".format(json.dumps(table_json, indent=2))) self.assertEqual(table_json['0']['result'], 0) - self.assertEqual(len(table_json['0']['data']['Sessions']), 0) + self.assertEqual(len(table_json['0']['data']['sessions']), 0) def _configure_auth(self, mount, id_name, mds_caps, osd_caps=None, mon_caps=None): """ -- 2.39.5