openstack/python-openstackclient
Code Issues Proposed changes

Merge "Replace assertEqual(None, *) with assertIsNone in tests"

Browse Source
This commit is contained in:
Jenkins 2015-12-17 19:38:09 +00:00 committed by Gerrit Code Review
commit d66e666b67
3 changed files with 8 additions and 8 deletions
openstackclient/tests
identity/v3
test_identity_provider.py
network/v2
test_network.pytest_router.py

4
openstackclient/tests/identity/v3/test_identity_provider.py

@ -638,5 +638,5 @@ class TestIdentityProviderSet(TestIdentityProvider):
# expect take_action() to return (None, None) as
# neither --enable nor --disable was specified
self.assertEqual(None, columns)
self.assertEqual(None, data)
self.assertIsNone(columns)
self.assertIsNone(data)

6
openstackclient/tests/network/v2/test_network.py

@ -301,7 +301,7 @@ class TestDeleteNetwork(TestNetwork):
result = self.cmd.take_action(parsed_args)
self.network.delete_network.assert_called_with(self._network)
self.assertEqual(None, result)
self.assertIsNone(result)
class TestListNetwork(TestNetwork):
@ -443,7 +443,7 @@ class TestSetNetwork(TestNetwork):
result = self.cmd.take_action(parsed_args)
self.network.update_network.assert_called_with(self._network)
self.assertEqual(None, result)
self.assertIsNone(result)
def test_set_that(self):
self._network.is_dirty = True
@ -463,7 +463,7 @@ class TestSetNetwork(TestNetwork):
result = self.cmd.take_action(parsed_args)
self.network.update_network.assert_called_with(self._network)
self.assertEqual(None, result)
self.assertIsNone(result)
def test_set_nothing(self):
self._network.is_dirty = False

6
openstackclient/tests/network/v2/test_router.py

@ -115,7 +115,7 @@ class TestDeleteRouter(TestRouter):
result = self.cmd.take_action(parsed_args)
self.network.delete_router.assert_called_with(self._router)
self.assertEqual(None, result)
self.assertIsNone(result)
class TestListRouter(TestRouter):
@ -235,7 +235,7 @@ class TestSetRouter(TestRouter):
'name': 'noob',
}
self.network.update_router.assert_called_with(self._router, **attrs)
self.assertEqual(None, result)
self.assertIsNone(result)
def test_set_that(self):
arglist = [
@ -257,7 +257,7 @@ class TestSetRouter(TestRouter):
'distributed': False,
}
self.network.update_router.assert_called_with(self._router, **attrs)
self.assertEqual(None, result)
self.assertIsNone(result)
def test_set_distributed_centralized(self):
arglist = [