openstack/ironic
Code Issues Proposed changes

Merge "Fix tests return codes"

Browse Source
This commit is contained in:
Jenkins
2013-09-19 01:17:44 +00:00
committed by Gerrit Code Review
parent 407230f8b3 72aebeed64
commit d6df2e72dd
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ironic/tests/api/test_chassis.py
View File

@@ -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'])

2
ironic/tests/api/test_nodes.py
View File

@@ -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'])

9
ironic/tests/api/test_ports.py
View File

@@ -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'])