summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-02-20 06:32:27 +0000
committerGerrit Code Review <review@openstack.org>2014-02-20 06:32:27 +0000
commit43f1f7851a1ad46478d00183fd438cfde86c05ff (patch)
treea33845ccf613d9f6daf7286d2854d80c9b9c7115
parent97309b918b164b4c59637c8817a1322f2a1ea9af (diff)
parent93f9e68ca22d19fdc636b7d50a4d08e4ea07d80e (diff)
downloadpython-novaclient-43f1f7851a1ad46478d00183fd438cfde86c05ff.tar.gz
Merge "Replace assertEqual(None, *) with assertIsNone in tests"
-rw-r--r--novaclient/tests/test_client.py2
-rw-r--r--novaclient/tests/v1_1/test_floating_ips.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/novaclient/tests/test_client.py b/novaclient/tests/test_client.py
index 581776ca..d5867024 100644
--- a/novaclient/tests/test_client.py
+++ b/novaclient/tests/test_client.py
@@ -205,7 +205,7 @@ class ClientTest(utils.TestCase):
def test_get_password_none(self):
cs = novaclient.client.HTTPClient("user", None, "", "")
- self.assertEqual(cs._get_password(), None)
+ self.assertIsNone(cs._get_password())
def test_get_password_func(self):
cs = novaclient.client.HTTPClient("user", None, "", "")
diff --git a/novaclient/tests/v1_1/test_floating_ips.py b/novaclient/tests/v1_1/test_floating_ips.py
index 337db3e2..0b2313f5 100644
--- a/novaclient/tests/v1_1/test_floating_ips.py
+++ b/novaclient/tests/v1_1/test_floating_ips.py
@@ -41,7 +41,7 @@ class FloatingIPsTest(utils.TestCase):
def test_create_floating_ip(self):
fl = cs.floating_ips.create()
cs.assert_called('POST', '/os-floating-ips')
- self.assertEqual(fl.pool, None)
+ self.assertIsNone(fl.pool)
self.assertIsInstance(fl, floating_ips.FloatingIP)
def test_create_floating_ip_with_pool(self):