rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename webserver.py to webserver_sub.py.

Browse Source
This commit is contained in:
Florian Bruhin 2015-09-18 20:08:31 +02:00
parent 34f8e9ef18
commit a8a2fd2e7d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/dev/freeze_tests.py
View File

@ -73,8 +73,8 @@ def main():
cx.setup( cx.setup(
executables=[cx.Executable('scripts/dev/run_frozen_tests.py', executables=[cx.Executable('scripts/dev/run_frozen_tests.py',
targetName='run-frozen-tests'), targetName='run-frozen-tests'),
cx.Executable('tests/integration/webserver.py', cx.Executable('tests/integration/webserver_sub.py',
targetName='webserver')], targetName='webserver_sub')],
options={'build_exe': get_build_exe_options()}, options={'build_exe': get_build_exe_options()},
**setupcommon.setupdata **setupcommon.setupdata
) )

5
tests/integration/conftest.py
View File

@ -127,11 +127,12 @@ class HTTPBin(QObject):
"""Start the webserver.""" """Start the webserver."""
if hasattr(sys, 'frozen'): if hasattr(sys, 'frozen'):
executable = os.path.join(os.path.dirname(sys.executable), executable = os.path.join(os.path.dirname(sys.executable),
'webserver') 'webserver_sub')
args = [] args = []
else: else:
executable = sys.executable executable = sys.executable
args = [os.path.join(os.path.dirname(__file__), 'webserver.py')] args = [os.path.join(os.path.dirname(__file__),
'webserver_sub.py')]
self.proc.start(executable, args + [str(self.port)]) self.proc.start(executable, args + [str(self.port)])
ok = self.proc.waitForStarted() ok = self.proc.waitForStarted()

0
tests/integration/webserver.py → tests/integration/webserver_sub.py
View File