Merge branch 'master' into set-retry-after

Conflicts:
	tests/test_throttling.py

1 files changed, 0 insertions, 27 deletions

diff --git a/rest_framework/tests/test_reverse.py b/rest_framework/tests/test_reverse.py
deleted file mode 100644
index 690a30b1..00000000
--- a/rest_framework/tests/test_reverse.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from __future__ import unicode_literals
-from django.test import TestCase
-from rest_framework.compat import patterns, url
-from rest_framework.reverse import reverse
-from rest_framework.test import APIRequestFactory
-
-factory = APIRequestFactory()
-
-
-def null_view(request):
-    pass
-
-urlpatterns = patterns('',
-    url(r'^view$', null_view, name='view'),
-)
-
-
-class ReverseTests(TestCase):
-    """
-    Tests for fully qualified URLs when using `reverse`.
-    """
-    urls = 'rest_framework.tests.test_reverse'
-
-    def test_reversed_urls_are_fully_qualified(self):
-        request = factory.get('/view')
-        url = reverse('view', request=request)
-        self.assertEqual(url, 'http://testserver/view')