From 72aebeed640c53d29735d3b2f8f153fee0e23b8c Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Tue, 17 Sep 2013 18:53:33 +0100 Subject: [PATCH] Fix tests return codes WSME 0.5b5 was released fixing the return codes. Closes-Bug: #1200517 Change-Id: Icaffe61dfc8f7124b9e32a8ee77f322ba1578176 --- ironic/tests/api/test_chassis.py | 9 +++------ ironic/tests/api/test_nodes.py | 2 +- ironic/tests/api/test_ports.py | 9 +++------ 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/ironic/tests/api/test_chassis.py b/ironic/tests/api/test_chassis.py index f6a2f5f0e2..eb09d9fba2 100644 --- a/ironic/tests/api/test_chassis.py +++ b/ironic/tests/api/test_chassis.py @@ -111,8 +111,7 @@ class TestPatch(base.FunctionalTest): [{'path': '/extra/a', 'value': 'b', 'op': 'add'}], expect_errors=True) - # TODO(yuriyz): change to 404 (bug 1200517) - self.assertEqual(response.status_int, 500) + self.assertEqual(response.status_int, 404) self.assertEqual(response.content_type, 'application/json') self.assertTrue(response.json['error_message']) @@ -235,8 +234,7 @@ class TestDelete(base.FunctionalTest): self.delete('/chassis/%s' % cdict['uuid']) response = self.get_json('/chassis/%s' % cdict['uuid'], expect_errors=True) - # TODO(yuriyz): change to 404 (bug 1200517) - self.assertEqual(response.status_int, 500) + self.assertEqual(response.status_int, 404) self.assertEqual(response.content_type, 'application/json') self.assertTrue(response.json['error_message']) @@ -254,7 +252,6 @@ class TestDelete(base.FunctionalTest): def test_delete_chassis_not_found(self): uuid = uuidutils.generate_uuid() response = self.delete('/chassis/%s' % uuid, expect_errors=True) - # TODO(yuriyz): change to 404 (bug 1200517) - self.assertEqual(response.status_int, 500) + self.assertEqual(response.status_int, 404) self.assertEqual(response.content_type, 'application/json') self.assertTrue(response.json['error_message']) diff --git a/ironic/tests/api/test_nodes.py b/ironic/tests/api/test_nodes.py index 9b8bb223bf..e568ef4b8c 100644 --- a/ironic/tests/api/test_nodes.py +++ b/ironic/tests/api/test_nodes.py @@ -275,7 +275,7 @@ class TestDelete(base.FunctionalTest): self.delete('/nodes/%s' % ndict['uuid']) response = self.get_json('/nodes/%s' % ndict['uuid'], expect_errors=True) - self.assertEqual(response.status_int, 500) + self.assertEqual(response.status_int, 404) self.assertEqual(response.content_type, 'application/json') self.assertTrue(response.json['error_message']) diff --git a/ironic/tests/api/test_ports.py b/ironic/tests/api/test_ports.py index 57635e4361..3885c45a2b 100644 --- a/ironic/tests/api/test_ports.py +++ b/ironic/tests/api/test_ports.py @@ -109,8 +109,7 @@ class TestPatch(base.FunctionalTest): 'value': 'b', 'op': 'add'}], expect_errors=True) - # TODO(yuriyz): change to 404 (bug 1200517) - self.assertEqual(response.status_int, 500) + self.assertEqual(response.status_int, 404) self.assertEqual(response.content_type, 'application/json') self.assertTrue(response.json['error_message']) @@ -237,8 +236,7 @@ class TestDelete(base.FunctionalTest): self.delete('/ports/%s' % pdict['uuid']) response = self.get_json('/ports/%s' % pdict['uuid'], expect_errors=True) - # TODO(yuriyz): change to 404 (bug 1200517) - self.assertEqual(response.status_int, 500) + self.assertEqual(response.status_int, 404) self.assertEqual(response.content_type, 'application/json') self.assertTrue(response.json['error_message']) @@ -247,7 +245,6 @@ class TestDelete(base.FunctionalTest): self.delete('/ports/%s' % pdict['address']) response = self.get_json('/ports/%s' % pdict['uuid'], expect_errors=True) - # TODO(yuriyz): change to 404 (bug 1200517) - self.assertEqual(response.status_int, 500) + self.assertEqual(response.status_int, 404) self.assertEqual(response.content_type, 'application/json') self.assertTrue(response.json['error_message'])