import ceph quincy 17.2.6

[ceph.git] / ceph / qa / tasks / cephfs / test_scrub_checks.py

diff --git a/ceph/qa/tasks/cephfs/test_scrub_checks.py b/ceph/qa/tasks/cephfs/test_scrub_checks.py
index ac86b24f0a57f16ac26859408a072c5a8c7e5d1a..0e84f7ed2645cfdacc8b89f05359da68a1497595 100644 (file)
--- a/ceph/qa/tasks/cephfs/test_scrub_checks.py
+++ b/ceph/qa/tasks/cephfs/test_scrub_checks.py
@@ -139,8 +139,7 @@ done
 
         # resume and verify
         self._resume_scrub(0)
-        out_json = self.fs.get_scrub_status()
-        self.assertTrue("no active" in out_json['status'])
+        self.assertTrue(self.fs.wait_until_scrub_complete(sleep=5, timeout=30))
 
         checked = self._check_task_status_na()
         self.assertTrue(checked)