Revision: 3784
Author: jussi.ao.malinen
Date: Mon Jun 28 06:06:17 2010
Log: added coverage support to atest
http://code.google.com/p/robotframework/source/detail?r=3784
Modified:
/trunk/atest/resources/atest_resource.txt
/trunk/atest/robot/external/unit_tests.txt
/trunk/atest/robot/parsing/data_formats/formats_resource.txt
/trunk/atest/robot/running/stopping_with_signal.txt
/trunk/atest/run_atests.py
=======================================
--- /trunk/atest/resources/atest_resource.txt Tue May 11 03:39:10 2010
+++ /trunk/atest/resources/atest_resource.txt Mon Jun 28 06:06:17 2010
@@ -93,9 +93,14 @@
Set Runners
${robot} = Join Path ${ROBOTPATH} runner.py
+ ${INTERPRETER} = Get Coverage Runner
Set Suite Variable $ROBOT ${INTERPRETER} ${robot}
${rebot} = Join Path ${ROBOTPATH} rebot.py
Set Suite Variable $REBOT ${INTERPRETER} ${rebot}
+
+Get Coverage Runner
+ ${INTERPRETER} = Set Variable If '${INTERPRETER}' == 'coverage'
coverage run -p ${INTERPRETER}
+ [return] ${INTERPRETER}
Check Test Case
[Arguments] ${name} ${status}=${None} ${message}=${None}
=======================================
--- /trunk/atest/robot/external/unit_tests.txt Mon Jun 28 05:20:55 2010
+++ /trunk/atest/robot/external/unit_tests.txt Mon Jun 28 06:06:17 2010
@@ -19,6 +19,7 @@
*** Keywords ***
Run Unit Tests
[Timeout]
+ ${INTERPRETER} = Get Coverage Runner
${rc} = Run And Return RC ${INTERPRETER} ${TESTPATH} --quiet
1>${STDOUTFILE} 2> ${STDERRFILE}
Get Stderr
Get Stdout
=======================================
--- /trunk/atest/robot/parsing/data_formats/formats_resource.txt Wed May 26
02:40:28 2010
+++ /trunk/atest/robot/parsing/data_formats/formats_resource.txt Mon Jun 28
06:06:17 2010
@@ -69,6 +69,7 @@
Check Suite Contains Tests ${suite} @{SUBSUITE_TESTS}
Check Is Docutils Installed
+ ${INTERPRETER} = Set Variable If '${INTERPRETER}' == 'coverage'
python ${INTERPRETER}
${output} = Run ${INTERPRETER} -c "import docutils"
${DOCUTILS INSTALLED} = Set Variable If """${output}""" == "" YES
NO
Set Suite Variable $DOCUTILS INSTALLED
=======================================
--- /trunk/atest/robot/running/stopping_with_signal.txt Fri May 28 10:11:20
2010
+++ /trunk/atest/robot/running/stopping_with_signal.txt Mon Jun 28 06:06:17
2010
@@ -96,6 +96,7 @@
Set Runners
${path to datasource} = Set Variables And Get Datasources
${datasource}
${path to runner} = Join Path ${ROBOTPATH} runner.py
+ ${runner} = Get Coverage Runner
@{command} = Create List ${runner} ${path to runner} --variable
TESTSIGNALFILE:${test signal file} --output ${OUTFILE} --report None
--log None --debugfile ${TEST DEBUG FILE} --variable
TEARDOWNSLEEP:${teardown sleep} ${path to datasource}
Log Many @{command}
ProcessManager.start process @{command}
=======================================
--- /trunk/atest/run_atests.py Wed May 12 06:09:10 2010
+++ /trunk/atest/run_atests.py Mon Jun 28 06:06:17 2010
@@ -72,8 +72,8 @@
'OUTPUTDIR' : RESULTDIR,
'INTERPRETER': interpreter,
'PLATFORM': sys.platform,
- 'RUNNER': ('python' in os.path.basename(interpreter) and 'pybot'
- or 'jybot')
+ 'RUNNER': ('jython' in os.path.basename(interpreter) and 'jybot'
+ or 'pybot')
}
if os.name == 'nt':
args += ' --exclude nonwindows'
