mgr/dashboard: Change to Status Code 400 by default.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --git a/qa/tasks/mgr/dashboard/helper.py b/qa/tasks/mgr/dashboard/helper.py
index 1be8243d34d45ef10129a48ca7d592af2674b5df..4640fc9b98139f051ed62d6e69e8fea24153a49c 100644 (file)
--- 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 73267d11dbd0ba2f6b2a4dc239ee34881c1dd55e..d8977bb264dc3b8d6b02badb206757ff26542826 100644 (file)
--- 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)