summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-01 12:40:23 +0000
committerGerrit Code Review <review@openstack.org>2016-11-01 12:40:23 +0000
commitc0e1e88438d7d245955ea54452378e8d063c758b (patch)
tree9d75f5e38e04541ee2001fa923ec6d53e4703748
parent36c35984a11667290e177e10c6fb67c6a50e1d9b (diff)
parent4f0ad5146752076ab1d2bdcc28b19b20c3039a91 (diff)
downloadoslo-middleware-c0e1e88438d7d245955ea54452378e8d063c758b.tar.gz
Merge "Replace 'assertEqual(None, ...)' with 'assertIsNone(...)'"
-rw-r--r--oslo_middleware/tests/test_cors.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/oslo_middleware/tests/test_cors.py b/oslo_middleware/tests/test_cors.py
index e8276f3..8efa2c8 100644
--- a/oslo_middleware/tests/test_cors.py
+++ b/oslo_middleware/tests/test_cors.py
@@ -361,7 +361,7 @@ class CORSRegularRequestTest(CORSTestBase):
self.assertEqual(['http://valid.example.com'], gc.allowed_origin)
self.assertEqual(False, gc.allow_credentials)
self.assertEqual([], gc.expose_headers)
- self.assertEqual(None, gc.max_age)
+ self.assertIsNone(gc.max_age)
self.assertEqual(['GET'], gc.allow_methods)
self.assertEqual([], gc.allow_headers)
@@ -678,7 +678,7 @@ class CORSPreflightRequestTest(CORSTestBase):
self.assertEqual(gc.allowed_origin, ['http://valid.example.com'])
self.assertEqual(gc.allow_credentials, False)
self.assertEqual(gc.expose_headers, [])
- self.assertEqual(gc.max_age, None)
+ self.assertIsNone(gc.max_age)
self.assertEqual(gc.allow_methods, ['GET'])
self.assertEqual(gc.allow_headers, [])
@@ -1195,7 +1195,7 @@ class CORSTestWildcard(CORSTestBase):
self.assertEqual(['http://default.example.com'], gc.allowed_origin)
self.assertEqual(True, gc.allow_credentials)
self.assertEqual([], gc.expose_headers)
- self.assertEqual(None, gc.max_age)
+ self.assertIsNone(gc.max_age)
self.assertEqual(['GET', 'PUT', 'POST', 'DELETE', 'HEAD'],
gc.allow_methods)
self.assertEqual([], gc.allow_headers)