From: Sebastian Wagner Date: Mon, 23 Apr 2018 15:49:28 +0000 (+0200) Subject: mgr/dashboard: Change to Status Code 400 by default. X-Git-Tag: v14.0.0~185^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a49f39f60ef734db1eef8ba6e23ffdc898e994e9;p=ceph.git mgr/dashboard: Change to Status Code 400 by default. Signed-off-by: Sebastian Wagner --- diff --git a/qa/tasks/mgr/dashboard/helper.py b/qa/tasks/mgr/dashboard/helper.py index 1be8243d34d45..4640fc9b98139 100644 --- a/qa/tasks/mgr/dashboard/helper.py +++ b/qa/tasks/mgr/dashboard/helper.py @@ -155,7 +155,7 @@ class DashboardTestCase(MgrTestCase): @classmethod def _task_request(cls, method, url, data, timeout): res = cls._request(url, method, data) - cls._assertIn(cls._resp.status_code, [200, 201, 202, 204, 409]) + cls._assertIn(cls._resp.status_code, [200, 201, 202, 204, 400]) if cls._resp.status_code != 202: log.info("task finished immediately") diff --git a/qa/tasks/mgr/dashboard/test_rbd.py b/qa/tasks/mgr/dashboard/test_rbd.py index 73267d11dbd0b..d8977bb264dc3 100644 --- a/qa/tasks/mgr/dashboard/test_rbd.py +++ b/qa/tasks/mgr/dashboard/test_rbd.py @@ -260,8 +260,8 @@ class RbdTest(DashboardTestCase): res = self.create_image('rbd', 'test_rbd_twice', 10240) res = self.create_image('rbd', 'test_rbd_twice', 10240) - self.assertStatus(409) - self.assertEqual(res, {"errno": 17, "status": 409, "component": "rbd", + self.assertStatus(400) + self.assertEqual(res, {"errno": 17, "status": 400, "component": "rbd", "detail": "[errno 17] error creating image"}) self.remove_image('rbd', 'test_rbd_twice') self.assertStatus(204) @@ -472,7 +472,7 @@ class RbdTest(DashboardTestCase): 'snap_name': 'snap1'}) res = self.remove_image('rbd', 'cimg') - self.assertStatus(409) + self.assertStatus(400) self.assertIn('errno', res) self.assertEqual(res['errno'], 39)