diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-17 19:38:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-17 19:38:09 +0000 |
| commit | d66e666b67168249264d3f5013ea9ab53457aed2 (patch) | |
| tree | 88ca008f22dc597099bf6140c0ff8b23c832d591 /openstackclient | |
| parent | e590597871e1b28ef4a8f2595265c1da2745276e (diff) | |
| parent | fe7d2d12c0f2e5d9bbd089b09977a841b126deab (diff) | |
| download | python-openstackclient-d66e666b67168249264d3f5013ea9ab53457aed2.tar.gz | |
Merge "Replace assertEqual(None, *) with assertIsNone in tests"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/identity/v3/test_identity_provider.py | 4 | ||||
| -rw-r--r-- | openstackclient/tests/network/v2/test_network.py | 6 | ||||
| -rw-r--r-- | openstackclient/tests/network/v2/test_router.py | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/openstackclient/tests/identity/v3/test_identity_provider.py b/openstackclient/tests/identity/v3/test_identity_provider.py index db097d5d..36358be3 100644 --- a/openstackclient/tests/identity/v3/test_identity_provider.py +++ b/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) diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py index 5a718686..f22224b6 100644 --- a/openstackclient/tests/network/v2/test_network.py +++ b/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 diff --git a/openstackclient/tests/network/v2/test_router.py b/openstackclient/tests/network/v2/test_router.py index d483be85..fba6e192 100644 --- a/openstackclient/tests/network/v2/test_router.py +++ b/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 = [ |