openstack/zun
Code Issues Proposed changes

Merge "Fix order of arguments in assertEqual"

Browse Source
This commit is contained in:
Jenkins 2017-03-12 05:17:41 +00:00 committed by Gerrit Code Review
commit 92387ce610
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zun/tests/unit/api/controllers/v1/test_zun_service.py
View File

@ -49,8 +49,8 @@ class TestZunServiceController(api_base.FunctionalTest):
svc_up.return_value = "up"
response = self.get_json('/services')
self.assertEqual(len(response['services']), 1)
self.assertEqual(response['services'][0]['id'], 1)
self.assertEqual(1, len(response['services']))
self.assertEqual(1, response['services'][0]['id'])
@mock.patch.object(objects.ZunService, 'list')
@mock.patch.object(servicegroup.ServiceGroup, 'service_is_up')

2
zun/tests/unit/conf/test_conf.py
View File

@ -24,7 +24,7 @@ class ConfTestCase(base.TestCase):
def test_list_opts(self):
for group, opt_list in opts.list_opts():
if isinstance(group, six.string_types):
self.assertEqual(group, 'DEFAULT')
self.assertEqual('DEFAULT', group)
else:
self.assertIsInstance(group, cfg.OptGroup)
for opt in opt_list:

2
zun/tests/unit/container/docker/test_docker_driver.py
View File

@ -106,7 +106,7 @@ class TestDockerDriver(base.DriverTestCase):
}
self.mock_docker.create_container.assert_called_once_with(
mock_container.image, **kwargs)
self.assertEqual(result_container.container_id, 'val1')
self.assertEqual('val1', result_container.container_id)
self.assertEqual(result_container.status,
fields.ContainerStatus.STOPPED)

2
zun/tests/unit/scheduler/test_scheduler.py
View File

@ -40,7 +40,7 @@ class SchedulerTestCase(base.TestCase):
mock_service_is_up.side_effect = [False, True]
result = self.driver.hosts_up(self.context)
self.assertEqual(result, ['host2'])
self.assertEqual(['host2'], result)
mock_list_by_binary.assert_called_once_with(self.context,
'zun-compute')