From: Yan, Zheng <zyan@redhat.com>
Date: Fri, 16 Mar 2018 09:40:59 +0000 (+0800)
Subject: qa/cephfs: adjust check of 'cephfs-table-tool all show snap' output
X-Git-Tag: wip-pdonnell-testing-20180329.205607^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=338c3cf4c39af72197d71e45eda5bd4a349131f3;p=ceph-ci.git

qa/cephfs: adjust check of 'cephfs-table-tool all show snap' output

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/qa/tasks/cephfs/test_journal_repair.py b/qa/tasks/cephfs/test_journal_repair.py
index 62cbbb0684a..3a82b39d0c7 100644
--- a/qa/tasks/cephfs/test_journal_repair.py
+++ b/qa/tasks/cephfs/test_journal_repair.py
@@ -321,8 +321,10 @@ class TestJournalRepair(CephFSTestCase):
         # Should see no snaps
         self.assertEqual(
             json.loads(self.fs.table_tool(["all", "show", "snap"])),
-            {"version": 0,
+            {"version": 1,
              "snapserver": {"last_snap": 1,
+                            "last_created": 1,
+                            "last_destroyed": 1,
                             "pending_noop": [],
                             "snaps": [],
                             "need_to_purge": {},
@@ -363,6 +365,8 @@ class TestJournalRepair(CephFSTestCase):
             json.loads(self.fs.table_tool(["all", "show", "snap"])),
             {"version": 1,
              "snapserver": {"last_snap": 1,
+                            "last_created": 1,
+                            "last_destroyed": 1,
                             "pending_noop": [],
                             "snaps": [],
                             "need_to_purge": {},