Renamed some tests and removed references to modeltests/regressiontests.

1 files changed, 0 insertions, 163 deletions

diff --git a/tests/utils/http.py b/tests/utils/http.py
deleted file mode 100644
index 6d3bc025af..0000000000
--- a/tests/utils/http.py
+++ /dev/null
@@ -1,163 +0,0 @@
-from datetime import datetime
-import sys
-
-from django.http import HttpResponse, utils
-from django.test import RequestFactory
-from django.utils.datastructures import MultiValueDict
-from django.utils import http
-from django.utils import six
-from django.utils import unittest
-
-
-class TestUtilsHttp(unittest.TestCase):
-
-    def test_same_origin_true(self):
-        # Identical
-        self.assertTrue(http.same_origin('http://foo.com/', 'http://foo.com/'))
-        # One with trailing slash - see #15617
-        self.assertTrue(http.same_origin('http://foo.com', 'http://foo.com/'))
-        self.assertTrue(http.same_origin('http://foo.com/', 'http://foo.com'))
-        # With port
-        self.assertTrue(http.same_origin('https://foo.com:8000', 'https://foo.com:8000/'))
-
-    def test_same_origin_false(self):
-        # Different scheme
-        self.assertFalse(http.same_origin('http://foo.com', 'https://foo.com'))
-        # Different host
-        self.assertFalse(http.same_origin('http://foo.com', 'http://goo.com'))
-        # Different host again
-        self.assertFalse(http.same_origin('http://foo.com', 'http://foo.com.evil.com'))
-        # Different port
-        self.assertFalse(http.same_origin('http://foo.com:8000', 'http://foo.com:8001'))
-
-    def test_urlencode(self):
-        # 2-tuples (the norm)
-        result = http.urlencode((('a', 1), ('b', 2), ('c', 3)))
-        self.assertEqual(result, 'a=1&b=2&c=3')
-
-        # A dictionary
-        result = http.urlencode({ 'a': 1, 'b': 2, 'c': 3})
-        acceptable_results = [
-            # Need to allow all of these as dictionaries have to be treated as
-            # unordered
-            'a=1&b=2&c=3',
-            'a=1&c=3&b=2',
-            'b=2&a=1&c=3',
-            'b=2&c=3&a=1',
-            'c=3&a=1&b=2',
-            'c=3&b=2&a=1'
-        ]
-        self.assertTrue(result in acceptable_results)
-        result = http.urlencode({'a': [1, 2]}, doseq=False)
-        self.assertEqual(result, 'a=%5B%271%27%2C+%272%27%5D')
-        result = http.urlencode({'a': [1, 2]}, doseq=True)
-        self.assertEqual(result, 'a=1&a=2')
-        result = http.urlencode({'a': []}, doseq=True)
-        self.assertEqual(result, '')
-
-        # A MultiValueDict
-        result = http.urlencode(MultiValueDict({
-            'name': ['Adrian', 'Simon'],
-            'position': ['Developer']
-        }), doseq=True)
-        acceptable_results = [
-            # MultiValueDicts are similarly unordered
-            'name=Adrian&name=Simon&position=Developer',
-            'position=Developer&name=Adrian&name=Simon'
-        ]
-        self.assertTrue(result in acceptable_results)
-
-    def test_fix_IE_for_vary(self):
-        """
-        Regression for #16632.
-
-        `fix_IE_for_vary` shouldn't crash when there's no Content-Type header.
-        """
-
-        # functions to generate responses
-        def response_with_unsafe_content_type():
-            r = HttpResponse(content_type="text/unsafe")
-            r['Vary'] = 'Cookie'
-            return r
-
-        def no_content_response_with_unsafe_content_type():
-            # 'Content-Type' always defaulted, so delete it
-            r = response_with_unsafe_content_type()
-            del r['Content-Type']
-            return r
-
-        # request with & without IE user agent
-        rf = RequestFactory()
-        request = rf.get('/')
-        ie_request = rf.get('/', HTTP_USER_AGENT='MSIE')
-
-        # not IE, unsafe_content_type
-        response = response_with_unsafe_content_type()
-        utils.fix_IE_for_vary(request, response)
-        self.assertTrue('Vary' in response)
-
-        # IE, unsafe_content_type
-        response = response_with_unsafe_content_type()
-        utils.fix_IE_for_vary(ie_request, response)
-        self.assertFalse('Vary' in response)
-
-        # not IE, no_content
-        response = no_content_response_with_unsafe_content_type()
-        utils.fix_IE_for_vary(request, response)
-        self.assertTrue('Vary' in response)
-
-        # IE, no_content
-        response = no_content_response_with_unsafe_content_type()
-        utils.fix_IE_for_vary(ie_request, response)
-        self.assertFalse('Vary' in response)
-
-    def test_base36(self):
-        # reciprocity works
-        for n in [0, 1, 1000, 1000000]:
-            self.assertEqual(n, http.base36_to_int(http.int_to_base36(n)))
-        if not six.PY3:
-            self.assertEqual(sys.maxint, http.base36_to_int(http.int_to_base36(sys.maxint)))
-
-        # bad input
-        self.assertRaises(ValueError, http.int_to_base36, -1)
-        if not six.PY3:
-            self.assertRaises(ValueError, http.int_to_base36, sys.maxint + 1)
-        for n in ['1', 'foo', {1: 2}, (1, 2, 3), 3.141]:
-            self.assertRaises(TypeError, http.int_to_base36, n)
-
-        for n in ['#', ' ']:
-            self.assertRaises(ValueError, http.base36_to_int, n)
-        for n in [123, {1: 2}, (1, 2, 3), 3.141]:
-            self.assertRaises(TypeError, http.base36_to_int, n)
-
-        # more explicit output testing
-        for n, b36 in [(0, '0'), (1, '1'), (42, '16'), (818469960, 'django')]:
-            self.assertEqual(http.int_to_base36(n), b36)
-            self.assertEqual(http.base36_to_int(b36), n)
-
-
-class ETagProcessingTests(unittest.TestCase):
-    def testParsing(self):
-        etags = http.parse_etags(r'"", "etag", "e\"t\"ag", "e\\tag", W/"weak"')
-        self.assertEqual(etags, ['', 'etag', 'e"t"ag', r'e\tag', 'weak'])
-
-    def testQuoting(self):
-        quoted_etag = http.quote_etag(r'e\t"ag')
-        self.assertEqual(quoted_etag, r'"e\\t\"ag"')
-
-
-class HttpDateProcessingTests(unittest.TestCase):
-    def testParsingRfc1123(self):
-        parsed = http.parse_http_date('Sun, 06 Nov 1994 08:49:37 GMT')
-        self.assertEqual(datetime.utcfromtimestamp(parsed),
-                         datetime(1994, 11, 6, 8, 49, 37))
-
-    def testParsingRfc850(self):
-        parsed = http.parse_http_date('Sunday, 06-Nov-94 08:49:37 GMT')
-        self.assertEqual(datetime.utcfromtimestamp(parsed),
-                         datetime(1994, 11, 6, 8, 49, 37))
-
-    def testParsingAsctime(self):
-        parsed = http.parse_http_date('Sun Nov  6 08:49:37 1994')
-        self.assertEqual(datetime.utcfromtimestamp(parsed),
-                         datetime(1994, 11, 6, 8, 49, 37))