4 new revisions:
Revision: ecfa18225af5
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 05:50:23 2013
Log: include stat_config in the results with newrunner
http://code.google.com/p/robotframework/source/detail?r=ecfa18225af5
Revision: 8eb5b79a1bbb
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 05:52:10 2013
Log: statistics_config into settings
http://code.google.com/p/robotframework/source/detail?r=8eb5b79a1bbb
Revision: e9ee128f81d7
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 06:02:11 2013
Log: Added tests for newrunner report generation
http://code.google.com/p/robotframework/source/detail?r=e9ee128f81d7
Revision: 8323cbfdeeac
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 06:02:18 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=8323cbfdeeac
==============================================================================
Revision: ecfa18225af5
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 05:50:23 2013
Log: include stat_config in the results with newrunner
http://code.google.com/p/robotframework/source/detail?r=ecfa18225af5
Modified:
/src/robot/run.py
=======================================
--- /src/robot/run.py Thu May 30 02:27:45 2013
+++ /src/robot/run.py Thu May 30 05:50:23 2013
@@ -395,7 +395,8 @@
settings['WarnOnSkipped']).build(*datasources)
suite.configure(**settings.suite_config)
result = suite.run(settings)
- result.configure(status_rc=settings.status_rc)
+ result.configure(status_rc=settings.status_rc,
+ stat_config=settings.statistics_config)
LOGGER.info("Tests execution ended. Statistics:\n%s"
% result.suite.statistics.message)
if settings.log or settings.report or settings.xunit:
==============================================================================
Revision: 8eb5b79a1bbb
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 05:52:10 2013
Log: statistics_config into settings
http://code.google.com/p/robotframework/source/detail?r=8eb5b79a1bbb
Modified:
/src/robot/conf/settings.py
=======================================
--- /src/robot/conf/settings.py Thu May 30 04:00:03 2013
+++ /src/robot/conf/settings.py Thu May 30 05:52:10 2013
@@ -306,6 +306,18 @@
def xunit_skip_noncritical(self):
return self['XUnitSkipNonCritical']
+ @property
+ def statistics_config(self):
+ return {
+ 'suite_stat_level': self['SuiteStatLevel'],
+ 'tag_stat_include': self['TagStatInclude'],
+ 'tag_stat_exclude': self['TagStatExclude'],
+ 'tag_stat_combine': self['TagStatCombine'],
+ 'tag_stat_link': self['TagStatLink'],
+ 'tag_doc': self['TagDoc'],
+ }
+
+
class RobotSettings(_BaseSettings):
_extra_cli_opts = {'Output' : ('output', 'output.xml'),
@@ -421,17 +433,6 @@
'start_time': self['StartTime'],
'end_time': self['EndTime']
}
-
- @property
- def statistics_config(self):
- return {
- 'suite_stat_level': self['SuiteStatLevel'],
- 'tag_stat_include': self['TagStatInclude'],
- 'tag_stat_exclude': self['TagStatExclude'],
- 'tag_stat_combine': self['TagStatCombine'],
- 'tag_stat_link': self['TagStatLink'],
- 'tag_doc': self['TagDoc'],
- }
@property
def log_config(self):
==============================================================================
Revision: e9ee128f81d7
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 06:02:11 2013
Log: Added tests for newrunner report generation
http://code.google.com/p/robotframework/source/detail?r=e9ee128f81d7
Added:
/atest/robot/cli/nolog/nolog.py
/atest/robot/cli/nolog/nolog.txt
=======================================
--- /dev/null
+++ /atest/robot/cli/nolog/nolog.py Thu May 30 06:02:11 2013
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+def difference_between_stuff(eka, toka):
+ with open(eka) as content1:
+ with open(toka) as content2:
+ for l1,l2 in zip(content1, content2):
+ if 'generatedTimestamp' in l1:
+ continue
+ if 'generatedMillis' in l1:
+ continue
+ if l1 != l2:
+ raise AssertionError('%r\n is not same as\n%r' %
(l1,l2) )
=======================================
--- /dev/null
+++ /atest/robot/cli/nolog/nolog.txt Thu May 30 06:02:11 2013
@@ -0,0 +1,24 @@
+*** Settings ***
+Resource atest_resource.txt
+Force Tags regression pybot jybot
+Library nolog.py
+Test Template Run With Options
+
+*** Test Cases ***
+Should be same
+ -l none --tagstatcombine passANDfail
+ --tagstatcombine passANDfail
+ -l none --tagstatexclude pass
+ -l none --tagstatinclude pass
+
+*** Keywords ***
+Run With Options [Arguments] ${options}
+ Run Tests ${options} -r pybotreport.html misc/pass_and_fail.txt
+ Copy File
${OUTDIR}${/}pybotreport.html %{TEMPDIR}${/}pybotreport.html
+ Run Rebot -r rebotreport.html ${options} ${OUTFILE}
+ Copy File
${OUTDIR}${/}rebotreport.html %{TEMPDIR}${/}rebotreport.html
+ Difference between
stuff %{TEMPDIR}${/}pybotreport.html %{TEMPDIR}${/}rebotreport.html
+ [Teardown] Remove
Files %{TEMPDIR}${/}pybotreport.html %{TEMPDIR}${/}rebotreport.html
+
+
+
==============================================================================
Revision: 8323cbfdeeac
Branch: default
Author: Mika Hänninen <[email protected]>
Date: Thu May 30 06:02:18 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=8323cbfdeeac
Modified:
/src/robot/conf/settings.py
/src/robot/run.py
=======================================
--- /src/robot/conf/settings.py Thu May 30 05:21:03 2013
+++ /src/robot/conf/settings.py Thu May 30 06:02:18 2013
@@ -308,6 +308,18 @@
def xunit_skip_noncritical(self):
return self['XUnitSkipNonCritical']
+ @property
+ def statistics_config(self):
+ return {
+ 'suite_stat_level': self['SuiteStatLevel'],
+ 'tag_stat_include': self['TagStatInclude'],
+ 'tag_stat_exclude': self['TagStatExclude'],
+ 'tag_stat_combine': self['TagStatCombine'],
+ 'tag_stat_link': self['TagStatLink'],
+ 'tag_doc': self['TagDoc'],
+ }
+
+
class RobotSettings(_BaseSettings):
_extra_cli_opts = {'Output' : ('output', 'output.xml'),
@@ -423,17 +435,6 @@
'start_time': self['StartTime'],
'end_time': self['EndTime']
}
-
- @property
- def statistics_config(self):
- return {
- 'suite_stat_level': self['SuiteStatLevel'],
- 'tag_stat_include': self['TagStatInclude'],
- 'tag_stat_exclude': self['TagStatExclude'],
- 'tag_stat_combine': self['TagStatCombine'],
- 'tag_stat_link': self['TagStatLink'],
- 'tag_doc': self['TagDoc'],
- }
@property
def log_config(self):
=======================================
--- /src/robot/run.py Thu May 30 05:22:00 2013
+++ /src/robot/run.py Thu May 30 06:02:18 2013
@@ -395,7 +395,8 @@
settings['WarnOnSkipped']).build(*datasources)
suite.configure(**settings.suite_config)
result = suite.run(settings)
- result.configure(status_rc=settings.status_rc)
+ result.configure(status_rc=settings.status_rc,
+ stat_config=settings.statistics_config)
LOGGER.info("Tests execution ended. Statistics:\n%s"
% result.suite.statistics.message)
if settings.log or settings.report or settings.xunit:
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
