openstack/ironic
Code Issues Proposed changes

Merge "Be more precise with conductor group API tests"

Browse Source
This commit is contained in:
Zuul 2018-07-25 14:45:12 +00:00 committed by Gerrit Code Review
commit 69520d2610
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ironic/tests/unit/api/controllers/v1/test_node.py
View File

@ -405,7 +405,7 @@ class TestListNodes(test_api_base.BaseApiTest):
fields = 'conductor_group'
response = self.get_json(
'/nodes/%s?fields=%s' % (node.uuid, fields),
headers={api_base.Version.string: '1.44'},
headers={api_base.Version.string: '1.45'},
expect_errors=True)
self.assertEqual(http_client.NOT_ACCEPTABLE, response.status_int)
@ -1445,7 +1445,7 @@ class TestListNodes(test_api_base.BaseApiTest):
for url in ('/nodes?conductor_group=group1',
'/nodes/detail?conductor_group=group1'):
response = self.get_json(
url, headers={api_base.Version.string: "1.44"},
url, headers={api_base.Version.string: "1.45"},
expect_errors=True)
self.assertEqual('application/json', response.content_type)
self.assertEqual(http_client.NOT_ACCEPTABLE, response.status_code)
@ -2548,7 +2548,7 @@ class TestPatch(test_api_base.BaseApiTest):
node = obj_utils.create_test_node(self.context,
uuid=uuidutils.generate_uuid())
self.mock_update_node.return_value = node
headers = {api_base.Version.string: '1.44'}
headers = {api_base.Version.string: '1.45'}
response = self.patch_json('/nodes/%s' % node.uuid,
[{'path': '/conductor_group',
'value': 'foogroup',
@ -2790,7 +2790,7 @@ class TestPost(test_api_base.BaseApiTest):
self.assertEqual('foo', result['conductor_group'])
def test_create_node_specify_conductor_group_bad_version(self):
headers = {api_base.Version.string: '1.44'}
headers = {api_base.Version.string: '1.45'}
ndict = test_api_utils.post_get_test_node(conductor_group='foo')
response = self.post_json('/nodes', ndict, headers=headers,
expect_errors=True)

2
ironic/tests/unit/api/controllers/v1/test_utils.py
View File

@ -281,7 +281,7 @@ class TestApiUtils(base.TestCase):
@mock.patch.object(pecan, 'request', spec_set=['version'])
def test_check_allow_filter_by_conductor_group_fail(self, mock_request):
mock_request.version.minor = 44
mock_request.version.minor = 45
self.assertRaises(exception.NotAcceptable,
utils.check_allow_filter_by_conductor_group, 'foo')