From fe7d2d12c0f2e5d9bbd089b09977a841b126deab Mon Sep 17 00:00:00 2001
From: SaiKiran <saikiranveeravarapu@gmail.com>
Date: Thu, 17 Dec 2015 16:37:00 +0530
Subject: [PATCH] Replace assertEqual(None, *) with assertIsNone in tests
In python-openstackclient some test cases using asserEqual(None, *)
instead of assertIsNone(). assertIsNone method provides clear error message.
Change-Id: I3069a6436d11efa513ae94f21ceab46c498d6e25
Closes-Bug: #1527054
---
openstackclient/tests/identity/v3/test_identity_provider.py | 4 ++--
openstackclient/tests/network/v2/test_network.py | 6 +++---
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 db097d5df9..36358be315 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 5a718686cf..f22224b650 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 d483be85dd..fba6e192c5 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 = [