]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/mgr/dashboard/test_rbd: wait longer when purging 34847/head
authorKiefer Chang <kiefer.chang@suse.com>
Fri, 27 Mar 2020 05:14:09 +0000 (13:14 +0800)
committerKiefer Chang <kiefer.chang@suse.com>
Thu, 30 Apr 2020 04:28:49 +0000 (12:28 +0800)
Fixes: https://tracker.ceph.com/issues/44743
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
Co-authored-by: Kefu Chai <kefu@redhat.com>
Co-authored-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 1c3d6539d93961f9f7bd5308771725410bde32ec)

Conflicts:
qa/tasks/mgr/dashboard/test_rbd.py

qa/tasks/mgr/dashboard/test_rbd.py

index 039c8cc22fb58f8df0705d235e079a1a31b36cf0..252ca82df32abab79754b6af9bd3df868c72226e 100644 (file)
@@ -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)