summaryrefslogtreecommitdiff
path: root/tests/decorators
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2016-06-16 11:19:18 -0700
committerTim Graham <timograham@gmail.com>2016-06-16 14:19:18 -0400
commit4f336f66523001b009ab038b10848508fd208b3b (patch)
tree47474fb588013f1770246455ef7aa1a4163a1edb /tests/decorators
parentea34426ae789d31b036f58c8fd59ce299649e91e (diff)
downloaddjango-4f336f66523001b009ab038b10848508fd208b3b.tar.gz
Fixed #26747 -- Used more specific assertions in the Django test suite.
Diffstat (limited to 'tests/decorators')
-rw-r--r--tests/decorators/tests.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/decorators/tests.py b/tests/decorators/tests.py
index 08bb12ce29..c010a847ca 100644
--- a/tests/decorators/tests.py
+++ b/tests/decorators/tests.py
@@ -227,8 +227,8 @@ class MethodDecoratorTests(SimpleTestCase):
def func():
pass
- self.assertEqual(getattr(func, 'myattr', False), True)
- self.assertEqual(getattr(func, 'myattr2', False), True)
+ self.assertIs(getattr(func, 'myattr', False), True)
+ self.assertIs(getattr(func, 'myattr2', False), True)
# Decorate using method_decorator() on the method.
class TestPlain(object):
@@ -258,11 +258,11 @@ class MethodDecoratorTests(SimpleTestCase):
pass
for Test in (TestPlain, TestMethodAndClass, TestIterable):
- self.assertEqual(getattr(Test().method, 'myattr', False), True)
- self.assertEqual(getattr(Test().method, 'myattr2', False), True)
+ self.assertIs(getattr(Test().method, 'myattr', False), True)
+ self.assertIs(getattr(Test().method, 'myattr2', False), True)
- self.assertEqual(getattr(Test.method, 'myattr', False), True)
- self.assertEqual(getattr(Test.method, 'myattr2', False), True)
+ self.assertIs(getattr(Test.method, 'myattr', False), True)
+ self.assertIs(getattr(Test.method, 'myattr2', False), True)
self.assertEqual(Test.method.__doc__, 'A method')
self.assertEqual(Test.method.__name__, 'method')
@@ -284,7 +284,7 @@ class MethodDecoratorTests(SimpleTestCase):
def method(self):
return True
- self.assertEqual(Test().method(), False)
+ self.assertIs(Test().method(), False)
def test_descriptors(self):
@@ -442,13 +442,13 @@ class XFrameOptionsDecoratorsTests(TestCase):
return HttpResponse()
req = HttpRequest()
resp = a_view(req)
- self.assertEqual(resp.get('X-Frame-Options', None), None)
+ self.assertIsNone(resp.get('X-Frame-Options', None))
self.assertTrue(resp.xframe_options_exempt)
# Since the real purpose of the exempt decorator is to suppress
# the middleware's functionality, let's make sure it actually works...
r = XFrameOptionsMiddleware().process_response(req, resp)
- self.assertEqual(r.get('X-Frame-Options', None), None)
+ self.assertIsNone(r.get('X-Frame-Options', None))
class NeverCacheDecoratorTest(TestCase):