3 new revisions:
Revision: 040af9602985
Author: Mikko Korpela <[email protected]>
Date: Mon Jun 13 04:23:34 2011
Log: Add test for rebot none zero status code
http://code.google.com/p/robotframework/source/detail?r=040af9602985
Revision: e094d1ba1fee
Author: Mikko Korpela <[email protected]>
Date: Mon Jun 13 04:24:20 2011
Log: rebot status code
http://code.google.com/p/robotframework/source/detail?r=e094d1ba1fee
Revision: 5117a33df8ea
Author: Mikko Korpela <[email protected]>
Date: Mon Jun 13 04:24:45 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=5117a33df8ea
==============================================================================
Revision: 040af9602985
Author: Mikko Korpela <[email protected]>
Date: Mon Jun 13 04:23:34 2011
Log: Add test for rebot none zero status code
http://code.google.com/p/robotframework/source/detail?r=040af9602985
Modified:
/atest/robot/cli/rebot/nostatusrc.txt
=======================================
--- /atest/robot/cli/rebot/nostatusrc.txt Mon Apr 18 21:38:20 2011
+++ /atest/robot/cli/rebot/nostatusrc.txt Mon Jun 13 04:23:34 2011
@@ -1,7 +1,7 @@
*** Settings ***
Suite Setup Set Runners
Default Tags regression pybot jybot
-Resource rebot_cli_resource.txt
+Resource rebot_cli_resource.txt
*** Variables ***
${MISCDIR} ${CURDIR}${/}..${/}..${/}..${/}testdata${/}misc
@@ -14,6 +14,11 @@
Zero Return Code When Some Tests Fail
Return code can be forced to zero from commandline ${FAILINGSUITE}
+
+None zero Return Code When Some Tests Fail
+ Run Tests Without Processing Output ${EMPTY} ${FAILINGSUITE}
+ ${rc}= Run And Return Rc ${REBOT} --outputdir ${OUTDIR} ${OUTFILE}
+ Should Be Equal As Integers ${rc} 1
*** Keywords ***
Return code can be forced to zero from commandline
==============================================================================
Revision: e094d1ba1fee
Author: Mikko Korpela <[email protected]>
Date: Mon Jun 13 04:24:20 2011
Log: rebot status code
http://code.google.com/p/robotframework/source/detail?r=e094d1ba1fee
Modified:
/src/robot/__init__.py
/src/robot/serializing/testoutput.py
=======================================
--- /src/robot/__init__.py Mon Jun 13 01:48:54 2011
+++ /src/robot/__init__.py Mon Jun 13 04:24:20 2011
@@ -155,13 +155,9 @@
settings = RebotSettings(options)
LOGGER.register_console_logger(colors=settings['MonitorColors'])
LOGGER.disable_message_cache()
- Reporter().execute_rebot(settings, *datasources)
+ suite = Reporter().execute_rebot(settings, *datasources)
LOGGER.close()
- class RebotSuite(object):
- @property
- def return_code(self):
- return 0
- return RebotSuite() #TODO identify number of failed suites if needed
+ return suite
def _report_error(message, details=None, help=False):
=======================================
--- /src/robot/serializing/testoutput.py Mon Jun 13 03:41:55 2011
+++ /src/robot/serializing/testoutput.py Mon Jun 13 04:24:20 2011
@@ -39,6 +39,7 @@
def __init__(self):
self._robot_test_output_cached = None
self._temp_file = None
+ self._suite = None
def _make_report(self, report_path, log_path, data_model, settings):
if report_path:
@@ -56,9 +57,9 @@
def _robot_test_output(self, data_sources, settings):
if self._robot_test_output_cached is None:
- suite, exec_errors = process_outputs(data_sources, settings)
- suite.set_options(settings)
- self._robot_test_output_cached = RobotTestOutput(suite,
exec_errors, settings)
+ self._suite, exec_errors = process_outputs(data_sources,
settings)
+ self._suite.set_options(settings)
+ self._robot_test_output_cached = RobotTestOutput(self._suite,
exec_errors, settings)
return self._robot_test_output_cached
def _combine_outputs(self, data_sources, settings):
@@ -75,6 +76,7 @@
self.execute(settings, *data_sources)
if self._temp_file:
os.remove(self._temp_file)
+ return self._suite
def execute(self, settings, *data_sources):
data_model = jsparser.create_datamodel_from(data_sources[0])
==============================================================================
Revision: 5117a33df8ea
Author: Mikko Korpela <[email protected]>
Date: Mon Jun 13 04:24:45 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=5117a33df8ea
