RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-20 17:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/dashboard: fix tasks.mgr.dashboard.test_rbd.RbdTest.test_move_image_to_trash error

Browse Source 
The API call is a task and the response status is determined by whether
the call is completed within a pre-defined duration (2 seconds) or not.
We should also allow the status when the call takes longer.

Fixes: https://tracker.ceph.com/issues/46812
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
This commit is contained in:
Kiefer Chang 2020-08-03 13:42:18 +08:00
parent 9e01fcac91
commit d208d67f9f
No known key found for this signature in database
GPG Key ID: 038321232249E246
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qa/tasks/mgr/dashboard/test_rbd.py
View File

@ -173,14 +173,13 @@ class RbdTest(DashboardTestCase):
cls._ceph_cmd(['osd', 'pool', 'delete', 'rbd_data', 'rbd_data',
'--yes-i-really-really-mean-it'])
@classmethod
def create_image_in_trash(cls, pool, name, delay=0):
cls.create_image(pool, None, name, 10240)
img = cls._get('/api/block/image/{}%2F{}'.format(pool, name))
def create_image_in_trash(self, pool, name, delay=0):
self.create_image(pool, None, name, 10240)
img = self._get('/api/block/image/{}%2F{}'.format(pool, name))
cls._task_post("/api/block/image/{}%2F{}/move_trash".format(pool, name),
self._task_post("/api/block/image/{}%2F{}/move_trash".format(pool, name),
{'delay': delay})
self.assertStatus([200, 201])
return img['id']
@classmethod
@ -776,7 +775,6 @@ class RbdTest(DashboardTestCase):
def test_move_image_to_trash(self):
id = self.create_image_in_trash('rbd', 'test_rbd')
self.assertStatus(200)
self.get_image('rbd', None, 'test_rbd')
self.assertStatus(404)