dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1466 from niphlod/fix/system_tests

Browse Source 
fix launching system_tests without coverage
This commit is contained in:
mdipierro
2016-09-27 16:34:50 -05:00
committed by GitHub
parent 0e4ff55306 55f929bab4
commit 9e80654d2b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/widget.py
+6 -5
View File
@@ -55,8 +55,11 @@ def run_system_tests(options):
""" """
import subprocess import subprocess
major_version = sys.version_info[0] major_version = sys.version_info[0]
minor_version = sys.version_info[1]
call_args = [sys.executable, '-m', 'unittest', '-v', 'gluon.tests'] call_args = [sys.executable, '-m', 'unittest', '-v', 'gluon.tests']
if major_version == 2:
sys.stderr.write("Python 2.7\n")
else:
sys.stderr.write("Experimental Python 3.x.\n")
if options.with_coverage: if options.with_coverage:
has_coverage = False has_coverage = False
coverage_exec = 'coverage2' if major_version == 2 else 'coverage3' coverage_exec = 'coverage2' if major_version == 2 else 'coverage3'
@@ -70,14 +73,12 @@ def run_system_tests(options):
coverage_config_file) coverage_config_file)
call_args = [coverage_exec, 'run', '--rcfile=%s' % call_args = [coverage_exec, 'run', '--rcfile=%s' %
coverage_config, '-m', 'unittest', '-v', 'gluon.tests'] coverage_config, '-m', 'unittest', '-v', 'gluon.tests']
if major_version == 2:
sys.stderr.write("Python 2.7\n")
else:
sys.stderr.write("Experimental Python 3.x.\n")
if has_coverage: if has_coverage:
ret = subprocess.call(call_args) ret = subprocess.call(call_args)
else: else:
ret = 256 ret = 256
else:
ret = subprocess.call(call_args)
sys.exit(ret and 1) sys.exit(ret and 1)