innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #24965 -- Added changes from accidentally reverted file for last commit.

This commit is contained in:
Moritz Sichert 2015-06-10 22:57:51 +02:00 committed by Tim Graham
parent 296919e7a5
commit d58573e60d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/test/testcases.py
View File

@ -37,6 +37,7 @@ from django.test.utils import (
override_settings, override_settings,
) )
from django.utils import six from django.utils import six
from django.utils.decorators import classproperty
from django.utils.deprecation import ( from django.utils.deprecation import (
RemovedInDjango20Warning, RemovedInDjango21Warning, RemovedInDjango20Warning, RemovedInDjango21Warning,
) )
@ -1259,10 +1260,10 @@ class LiveServerTestCase(TransactionTestCase):
static_handler = _StaticFilesHandler static_handler = _StaticFilesHandler
@property @classproperty
def live_server_url(self): def live_server_url(cls):
return 'http://%s:%s' % ( return 'http://%s:%s' % (
self.server_thread.host, self.server_thread.port) cls.server_thread.host, cls.server_thread.port)
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):