summaryrefslogtreecommitdiff
path: root/tests/httpwrappers
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-10-28 12:02:56 +0200
committerTim Graham <timograham@gmail.com>2014-11-03 11:56:37 -0500
commitf7969b0920c403118656f6bfec58d6454d79ef1a (patch)
tree866df7de0524251323fef2b4262e672150d95f00 /tests/httpwrappers
parentc0c78f1b707f825eee974c65515a837f8cf46e66 (diff)
Fixed #23620 -- Used more specific assertions in the Django test suite.
Diffstat (limited to 'tests/httpwrappers')
-rw-r--r--tests/httpwrappers/tests.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/httpwrappers/tests.py b/tests/httpwrappers/tests.py
index 0be5df3024..9b9b19e180 100644
--- a/tests/httpwrappers/tests.py
+++ b/tests/httpwrappers/tests.py
@@ -78,10 +78,10 @@ class QueryDictTests(unittest.TestCase):
if six.PY2:
self.assertTrue(q.has_key('foo'))
- self.assertTrue('foo' in q)
+ self.assertIn('foo', q)
if six.PY2:
self.assertFalse(q.has_key('bar'))
- self.assertFalse('bar' in q)
+ self.assertNotIn('bar', q)
self.assertEqual(list(six.iteritems(q)), [('foo', 'bar')])
self.assertEqual(list(six.iterlists(q)), [('foo', ['bar'])])
@@ -118,7 +118,7 @@ class QueryDictTests(unittest.TestCase):
q = QueryDict(mutable=True)
q['name'] = 'john'
del q['name']
- self.assertFalse('name' in q)
+ self.assertNotIn('name', q)
def test_basic_mutable_operations(self):
q = QueryDict(mutable=True)
@@ -137,7 +137,7 @@ class QueryDictTests(unittest.TestCase):
self.assertEqual(q['foo'], 'another')
if six.PY2:
self.assertTrue(q.has_key('foo'))
- self.assertTrue('foo' in q)
+ self.assertIn('foo', q)
self.assertListEqual(sorted(list(six.iteritems(q))),
[('foo', 'another'), ('name', 'john')])
@@ -609,8 +609,8 @@ class CookieTests(unittest.TestCase):
"""
c = SimpleCookie()
c['test'] = "An,awkward;value"
- self.assertTrue(";" not in c.output().rstrip(';')) # IE compat
- self.assertTrue("," not in c.output().rstrip(';')) # Safari compat
+ self.assertNotIn(";", c.output().rstrip(';')) # IE compat
+ self.assertNotIn(",", c.output().rstrip(';')) # Safari compat
def test_decode(self):
"""
@@ -636,13 +636,13 @@ class CookieTests(unittest.TestCase):
"""
Test that a single non-standard cookie name doesn't affect all cookies. Ticket #13007.
"""
- self.assertTrue('good_cookie' in parse_cookie('good_cookie=yes;bad:cookie=yes').keys())
+ self.assertIn('good_cookie', parse_cookie('good_cookie=yes;bad:cookie=yes').keys())
def test_repeated_nonstandard_keys(self):
"""
Test that a repeated non-standard name doesn't affect all cookies. Ticket #15852
"""
- self.assertTrue('good_cookie' in parse_cookie('a:=b; a:=c; good_cookie=yes').keys())
+ self.assertIn('good_cookie', parse_cookie('a:=b; a:=c; good_cookie=yes').keys())
def test_httponly_after_load(self):
"""