Skip to content

Commit 2b17368

Browse files
committed
test server reloads code changes :)
1 parent 7bed933 commit 2b17368

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

cms/test_utils/cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
# -*- coding: utf-8 -*-
2+
from django.utils.functional import empty
23
import os
34

45
gettext = lambda s: s
56

6-
77
urlpatterns = []
88

9-
109
def configure(**extra):
1110
from django.conf import settings
1211
os.environ['DJANGO_SETTINGS_MODULE'] = 'cms.test_utils.cli'
@@ -183,6 +182,7 @@ def configure(**extra):
183182
)
184183
)
185184
defaults.update(extra)
185+
settings._wrapped = empty
186186
settings.configure(**defaults)
187187
from cms.conf import patch_settings
188188
patch_settings()

runtestserver.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from cms.test_utils.cli import configure
33
from cms.test_utils.tmpdir import temp_dir
44
import argparse
5+
from django.utils import autoreload
56
import os
67
import sys
78

@@ -25,22 +26,23 @@ def main():
2526
}
2627
}
2728
)
28-
from django.core.management import call_command
29-
call_command('syncdb', interactive=False, migrate_all=new_db)
30-
call_command('migrate', interactive=False, fake=new_db)
31-
from django.contrib.auth.models import User
32-
if not User.objects.filter(is_superuser=True).exists():
33-
usr = User()
34-
usr.username = 'admin'
35-
usr.email = '[email protected]'
36-
usr.set_password('admin')
37-
usr.is_superuser = True
38-
usr.is_staff = True
39-
usr.is_active = True
40-
usr.save()
41-
print
42-
print "A admin user (username: admin, password: admin) has been created."
43-
print
29+
if os.environ.get("RUN_MAIN") != "true":
30+
from django.core.management import call_command
31+
call_command('syncdb', interactive=False, migrate_all=new_db)
32+
call_command('migrate', interactive=False, fake=new_db)
33+
from django.contrib.auth.models import User
34+
if not User.objects.filter(is_superuser=True).exists():
35+
usr = User()
36+
usr.username = 'admin'
37+
usr.email = '[email protected]'
38+
usr.set_password('admin')
39+
usr.is_superuser = True
40+
usr.is_staff = True
41+
usr.is_active = True
42+
usr.save()
43+
print
44+
print "A admin user (username: admin, password: admin) has been created."
45+
print
4446
from django.contrib.staticfiles.management.commands import runserver
4547
rs = runserver.Command()
4648
rs.stdout = sys.stdout
@@ -49,9 +51,7 @@ def main():
4951
rs._raw_ipv6 = False
5052
rs.addr = args.bind
5153
rs.port = args.port
52-
rs.inner_run(addrport='%s:%s' % (args.bind, args.port),
53-
insecure_serving=True)
54-
54+
autoreload.main(rs.inner_run, (),{'addrport':'%s:%s' % (args.bind, args.port), 'insecure_serving':True, 'use_threading':True})
5555

5656
if __name__ == '__main__':
5757
main()

0 commit comments

Comments
 (0)