Merge "Using assertIsNone(xxx) instead of assertEqual(None, xxx)"
This commit is contained in:
commit
bfb061d02c
|
@ -61,8 +61,7 @@ class SessionContainerTest(test.NoDBTestCase):
|
||||||
self.ml.container_init.return_value = side_effect
|
self.ml.container_init.return_value = side_effect
|
||||||
self.ml.operation_info.return_value = \
|
self.ml.operation_info.return_value = \
|
||||||
(200, fake_api.fake_container_state(200))
|
(200, fake_api.fake_container_state(200))
|
||||||
self.assertEqual(None,
|
self.assertIsNone(self.session.container_init(config, instance))
|
||||||
self.session.container_init(config, instance))
|
|
||||||
calls = [mock.call.container_init(config),
|
calls = [mock.call.container_init(config),
|
||||||
mock.call.wait_container_operation(
|
mock.call.wait_container_operation(
|
||||||
'/1.0/operation/1234', 200, -1),
|
'/1.0/operation/1234', 200, -1),
|
||||||
|
@ -105,7 +104,6 @@ class SessionEventTest(test.NoDBTestCase):
|
||||||
instance = stubs._fake_instance()
|
instance = stubs._fake_instance()
|
||||||
operation_id = mock.Mock()
|
operation_id = mock.Mock()
|
||||||
self.ml.wait_container_operation.return_value = True
|
self.ml.wait_container_operation.return_value = True
|
||||||
self.assertEqual(None,
|
self.assertIsNone(self.session.operation_wait(operation_id, instance))
|
||||||
self.session.operation_wait(operation_id, instance))
|
|
||||||
self.ml.wait_container_operation.assert_called_with(operation_id,
|
self.ml.wait_container_operation.assert_called_with(operation_id,
|
||||||
200, -1)
|
200, -1)
|
||||||
|
|
Loading…
Reference in New Issue