]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: remove passed_validation check for test_damage
authorXiubo Li <xiubli@redhat.com>
Tue, 22 Dec 2020 06:10:50 +0000 (14:10 +0800)
committerXiubo Li <xiubli@redhat.com>
Mon, 15 Mar 2021 05:23:29 +0000 (13:23 +0800)
The mds scrub code have removed the detail info about scrubbing
in the response message.

Fixes: https://tracker.ceph.com/issues/48559
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 442a4856c15625d68e9f91d6fc1c781785f4e47f)

qa/tasks/cephfs/test_damage.py

index 20f9ca957e337e36e5df8faf3bf3dde9d8f82d0f..43ffbfe882d8f77baf73fa6f143478d2053d74b6 100644 (file)
@@ -454,9 +454,9 @@ class TestDamage(CephFSTestCase):
         scrub_json = self.fs.rank_tell(["scrub", "start", "/subdir", "repair"])
         log.info(json.dumps(scrub_json, indent=2))
 
-        self.assertEqual(scrub_json["passed_validation"], False)
-        self.assertEqual(scrub_json["raw_stats"]["checked"], True)
-        self.assertEqual(scrub_json["raw_stats"]["passed"], False)
+        self.assertNotEqual(scrub_json, None)
+        self.assertEqual(scrub_json["return_code"], 0)
+        self.assertEqual(self.fs.wait_until_scrub_complete(tag=scrub_json["scrub_tag"]), True)
 
         # Check that the file count is now correct
         self.mount_a.mount_wait()