summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Sichert <moritz.sichert@googlemail.com>2015-06-10 22:57:51 +0200
committerTim Graham <timograham@gmail.com>2015-06-12 18:29:26 -0400
commitd58573e60d7139711e24410741ef508bf0d124d8 (patch)
tree9a381b092224fcb63897467106b20a19212becf4
parent296919e7a58c21ff0325de8c747dc2dc8960104e (diff)
Refs #24965 -- Added changes from accidentally reverted file for last commit.
-rw-r--r--django/test/testcases.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/django/test/testcases.py b/django/test/testcases.py
index b17b3921d8..60bda8c623 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -37,6 +37,7 @@ from django.test.utils import (
override_settings,
)
from django.utils import six
+from django.utils.decorators import classproperty
from django.utils.deprecation import (
RemovedInDjango20Warning, RemovedInDjango21Warning,
)
@@ -1259,10 +1260,10 @@ class LiveServerTestCase(TransactionTestCase):
static_handler = _StaticFilesHandler
- @property
- def live_server_url(self):
+ @classproperty
+ def live_server_url(cls):
return 'http://%s:%s' % (
- self.server_thread.host, self.server_thread.port)
+ cls.server_thread.host, cls.server_thread.port)
@classmethod
def setUpClass(cls):