summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-30 18:41:30 +0000
committerGerrit Code Review <review@openstack.org>2016-09-30 18:41:30 +0000
commitfa85f839880a883037a94a0e36c515d1e05d98fb (patch)
tree0364bc84cf0b8f9eebf4d6e9e489efa55e842785
parent2d78f1ae940d4b2810437ea3c73379413c3ef6ef (diff)
parentafe54856b42e23e6d74da345f4870a95f646bc99 (diff)
downloados-client-config-fa85f839880a883037a94a0e36c515d1e05d98fb.tar.gz
Merge "Using assertIsNone() instead of assertEqual(None, ...)"
-rw-r--r--os_client_config/tests/test_config.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/os_client_config/tests/test_config.py b/os_client_config/tests/test_config.py
index 5cded54..0ef8da2 100644
--- a/os_client_config/tests/test_config.py
+++ b/os_client_config/tests/test_config.py
@@ -753,8 +753,8 @@ class TestConfigArgparse(base.TestCase):
opts, _remain = parser.parse_known_args(args)
self.assertEqual(opts.os_service_type, 'network')
self.assertEqual(opts.os_endpoint_type, 'admin')
- self.assertEqual(opts.os_network_service_type, None)
- self.assertEqual(opts.os_network_api_version, None)
+ self.assertIsNone(opts.os_network_service_type)
+ self.assertIsNone(opts.os_network_api_version)
self.assertEqual(opts.network_api_version, '4')
cloud = c.get_one_cloud(argparse=opts, verify=False)
self.assertEqual(cloud.config['service_type'], 'network')
@@ -776,12 +776,12 @@ class TestConfigArgparse(base.TestCase):
parser, args, ['compute', 'network', 'volume'])
opts, _remain = parser.parse_known_args(args)
self.assertEqual(opts.os_network_service_type, 'badtype')
- self.assertEqual(opts.os_compute_service_type, None)
- self.assertEqual(opts.os_volume_service_type, None)
+ self.assertIsNone(opts.os_compute_service_type)
+ self.assertIsNone(opts.os_volume_service_type)
self.assertEqual(opts.os_service_type, 'compute')
self.assertEqual(opts.os_compute_service_name, 'cloudServers')
self.assertEqual(opts.os_endpoint_type, 'admin')
- self.assertEqual(opts.os_network_api_version, None)
+ self.assertIsNone(opts.os_network_api_version)
self.assertEqual(opts.network_api_version, '4')
cloud = c.get_one_cloud(argparse=opts, verify=False)
self.assertEqual(cloud.config['service_type'], 'compute')