Modified the requests unit tests so that they aren't dependent on dictionary ordering. (75536fef) · Commits · Dom Sekotill / django

tests/regressiontests/requests/tests.py

+24 −26

Original line number	Diff line number	Diff line
		@@ -10,22 +10,21 @@ from django.utils.http import cookie_date
		class RequestsTests(unittest.TestCase):

		def test_httprequest(self):
		self.assertEquals(repr(HttpRequest()),
		"<HttpRequest\n"\
		"GET:{},\n"\
		"POST:{},\n"\
		"COOKIES:{},\n"\
		"META:{}>"
		)
		request = HttpRequest()
		self.assertEqual(request.GET.keys(), [])
		self.assertEqual(request.POST.keys(), [])
		self.assertEqual(request.COOKIES.keys(), [])
		self.assertEqual(request.META.keys(), [])

		def test_wsgirequest(self):
		self.assertEquals(repr(WSGIRequest({'PATH_INFO': 'bogus', 'REQUEST_METHOD': 'bogus'})),
		"<WSGIRequest\n"\
		"GET:<QueryDict: {}>,\n"\
		"POST:<QueryDict: {}>,\n"\
		"COOKIES:{},\n"\
		"META:{'PATH_INFO': u'bogus', 'REQUEST_METHOD': 'bogus', 'SCRIPT_NAME': u''}>"
		)
		request = WSGIRequest({'PATH_INFO': 'bogus', 'REQUEST_METHOD': 'bogus'})
		self.assertEqual(request.GET.keys(), [])
		self.assertEqual(request.POST.keys(), [])
		self.assertEqual(request.COOKIES.keys(), [])
		self.assertEqual(set(request.META.keys()), set(['PATH_INFO', 'REQUEST_METHOD', 'SCRIPT_NAME']))
		self.assertEqual(request.META['PATH_INFO'], 'bogus')
		self.assertEqual(request.META['REQUEST_METHOD'], 'bogus')
		self.assertEqual(request.META['SCRIPT_NAME'], '')

		def test_modpythonrequest(self):
		class FakeModPythonRequest(ModPythonRequest):
		@@ -39,25 +38,24 @@ class RequestsTests(unittest.TestCase):

		req = Dummy()
		req.uri = 'bogus'
		self.assertEquals(repr(FakeModPythonRequest(req)),
		"<ModPythonRequest\n"\
		"path:bogus,\n"\
		"GET:{},\n"\
		"POST:{},\n"\
		"COOKIES:{},\n"\
		"META:{}>")
		request = FakeModPythonRequest(req)
		self.assertEqual(request.path, 'bogus')
		self.assertEqual(request.GET.keys(), [])
		self.assertEqual(request.POST.keys(), [])
		self.assertEqual(request.COOKIES.keys(), [])
		self.assertEqual(request.META.keys(), [])

		def test_parse_cookie(self):
		self.assertEquals(parse_cookie('invalid:key=true'), {})
		self.assertEqual(parse_cookie('invalid:key=true'), {})

		def test_httprequest_location(self):
		request = HttpRequest()
		self.assertEquals(request.build_absolute_uri(location="https://www.example.com/asdf"),
		self.assertEqual(request.build_absolute_uri(location="https://www.example.com/asdf"),
		'https://www.example.com/asdf')

		request.get_host = lambda: 'www.example.com'
		request.path = ''
		self.assertEquals(request.build_absolute_uri(location="/path/with:colons"),
		self.assertEqual(request.build_absolute_uri(location="/path/with:colons"),
		'http://www.example.com/path/with:colons')

		def test_near_expiration(self):
		@@ -74,14 +72,14 @@ class RequestsTests(unittest.TestCase):
		time.sleep(0.001)
		response.set_cookie('datetime', expires=expires)
		datetime_cookie = response.cookies['datetime']
		self.assertEquals(datetime_cookie['max-age'], 10)
		self.assertEqual(datetime_cookie['max-age'], 10)

		def test_far_expiration(self):
		"Cookie will expire when an distant expiration time is provided"
		response = HttpResponse()
		response.set_cookie('datetime', expires=datetime(2028, 1, 1, 4, 5, 6))
		datetime_cookie = response.cookies['datetime']
		self.assertEquals(datetime_cookie['expires'], 'Sat, 01-Jan-2028 04:05:06 GMT')
		self.assertEqual(datetime_cookie['expires'], 'Sat, 01-Jan-2028 04:05:06 GMT')

		def test_max_age_expiration(self):
		"Cookie will expire if max_age is provided"