Merge pull request ceph#34232 from bk201/wip-44743

qa/tasks/mgr/dashboard/test_rbd: wait longer when purging Reviewed-by: Kefu Chai <[email protected]> Reviewed-by: Stephan Müller <[email protected]> Reviewed-by: Volker Theile <[email protected]> Reviewed-by: Laura Paduano <[email protected]>
zmc · Apr 1, 2020 · 4d5fa93 · 4d5fa93
2 parents fb99112 + 1c3d653
commit 4d5fa93
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/qa/tasks/mgr/dashboard/test_rbd.py b/qa/tasks/mgr/dashboard/test_rbd.py
@@ -844,15 +844,14 @@ def test_purge_trash(self):
         time.sleep(1)
 
         self.purge_trash('rbd')
-        self.assertStatus(200)
+        self.assertStatus([200, 201])
 
         time.sleep(1)
 
         trash_not_expired = self.get_trash('rbd', id_not_expired)
         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)
 
     def test_list_namespaces(self):
         self.create_namespace('rbd', 'ns')