ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1029 from normanjaeckel/RepairDjangoUpdate

Browse Source 
Move run_tornado import into runserver function because its imports need...
This commit is contained in:
Norman Jäckel 2013-11-10 13:21:32 -08:00
commit 84a2fa41f0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/__main__.py
View File

@ -23,7 +23,6 @@ from openslides.utils.main import (
setup_django_settings_module, setup_django_settings_module,
start_browser, start_browser,
write_settings) write_settings)
from openslides.utils.tornado_webserver import run_tornado
def main(): def main():
@ -231,6 +230,9 @@ def runserver(settings, args):
if args.start_browser: if args.start_browser:
browser_url = get_browser_url(address=args.address, port=port) browser_url = get_browser_url(address=args.address, port=port)
start_browser(browser_url) start_browser(browser_url)
# Now the settings is available and the function can be imported.
from openslides.utils.tornado_webserver import run_tornado
run_tornado(args.address, port, not args.no_reload) run_tornado(args.address, port, not args.no_reload)

2
tests/utils/test_main.py
View File

@ -131,7 +131,7 @@ class TestOtherFunctions(TestCase):
mock_runserver.assert_called_with(None, mock_args) mock_runserver.assert_called_with(None, mock_args)
@patch('openslides.__main__.get_port') @patch('openslides.__main__.get_port')
@patch('openslides.__main__.run_tornado') @patch('openslides.utils.tornado_webserver.run_tornado')
@patch('openslides.__main__.start_browser') @patch('openslides.__main__.start_browser')
def test_runserver(self, mock_start_browser, mock_run_tornado, mock_get_port): def test_runserver(self, mock_start_browser, mock_run_tornado, mock_get_port):
mock_get_port.return_value = 8000 mock_get_port.return_value = 8000