Refactored file_storage tests to avoid depending on servers tests.

2 files changed, 18 insertions, 7 deletions

diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py
index 406a4d79b6..e3f390ff61 100644
--- a/tests/file_storage/tests.py
+++ b/tests/file_storage/tests.py
@@ -7,6 +7,10 @@ import shutil
 import sys
 import tempfile
 import time
+try:
+    from urllib.request import urlopen
+except ImportError:     # Python 2
+    from urllib2 import urlopen
 import zlib
 from datetime import datetime, timedelta
 from io import BytesIO
@@ -22,12 +26,11 @@ from django.core.files.base import File, ContentFile
 from django.core.files.images import get_image_dimensions
 from django.core.files.storage import FileSystemStorage, get_storage_class
 from django.core.files.uploadedfile import UploadedFile
-from django.test import SimpleTestCase
+from django.test import LiveServerTestCase, SimpleTestCase
 from django.utils import six
 from django.utils import unittest
 from django.utils._os import upath
 from django.test.utils import override_settings
-from servers.tests import LiveServerBase
 
 try:
     from django.utils.image import Image
@@ -613,10 +616,13 @@ class NoNameFileTestCase(unittest.TestCase):
     def test_noname_file_get_size(self):
         self.assertEqual(File(BytesIO(b'A file with no name')).size, 19)
 
-class FileLikeObjectTestCase(LiveServerBase):
+
+class FileLikeObjectTestCase(LiveServerTestCase):
     """
     Test file-like objects (#15644).
     """
+    urls = 'file_storage.urls'
+
     def setUp(self):
         self.temp_dir = tempfile.mkdtemp()
         self.storage = FileSystemStorage(location=self.temp_dir)
@@ -628,12 +634,10 @@ class FileLikeObjectTestCase(LiveServerBase):
         """
         Test the File storage API with a file like object coming from urllib2.urlopen()
         """
-
-        file_like_object = self.urlopen('/example_view/')
+        file_like_object = urlopen(self.live_server_url + '/')
         f = File(file_like_object)
         stored_filename = self.storage.save("remote_file.html", f)
 
-        remote_file = self.urlopen('/example_view/')
-
+        remote_file = urlopen(self.live_server_url + '/')
         with self.storage.open(stored_filename) as stored_file:
             self.assertEqual(stored_file.read(), remote_file.read())
diff --git a/tests/file_storage/urls.py b/tests/file_storage/urls.py
new file mode 100644
index 0000000000..aefd8549e1
--- /dev/null
+++ b/tests/file_storage/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls import patterns, url
+from django.http import HttpResponse
+
+
+urlpatterns = patterns('',
+    url(r'^$', lambda req: HttpResponse('example view')),
+)