From e08d9afa6e21c57f5b03e79a77c67623199e9076 Mon Sep 17 00:00:00 2001 From: Kiefer Chang Date: Fri, 27 Mar 2020 13:14:09 +0800 Subject: [PATCH] qa/tasks/mgr/dashboard/test_rbd: wait longer when purging Fixes: https://tracker.ceph.com/issues/44743 Signed-off-by: Kiefer Chang Co-authored-by: Kefu Chai Co-authored-by: Volker Theile (cherry picked from commit 1c3d6539d93961f9f7bd5308771725410bde32ec) Conflicts: qa/tasks/mgr/dashboard/test_rbd.py --- qa/tasks/mgr/dashboard/test_rbd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/tasks/mgr/dashboard/test_rbd.py b/qa/tasks/mgr/dashboard/test_rbd.py index 039c8cc22fb58..252ca82df32ab 100644 --- a/qa/tasks/mgr/dashboard/test_rbd.py +++ b/qa/tasks/mgr/dashboard/test_rbd.py @@ -784,7 +784,7 @@ class RbdTest(DashboardTestCase): time.sleep(1) self._task_post('/api/block/image/trash/purge?pool_name={}'.format('rbd')) - self.assertStatus(200) + self.assertStatus([200, 201]) time.sleep(1) @@ -792,4 +792,4 @@ class RbdTest(DashboardTestCase): self.assertIsNotNone(trash_not_expired) trash_expired = self.get_trash('rbd', id_expired) - self.assertIsNone(trash_expired) + self.wait_until_equal(lambda: self.get_trash('rbd', id_expired), None, 60) -- 2.39.5