4 new revisions:
Revision: 3a26bb9a3060
Author: Pekka Klärck
Date: Fri Jun 17 05:33:27 2011
Log: Serialize tag stats also when --tagstat(in|ex)clude has removed
all ta...
http://code.google.com/p/robotframework/source/detail?r=3a26bb9a3060
Revision: d6a2ed4cc261
Author: Pekka Klärck
Date: Fri Jun 17 06:59:50 2011
Log: Always serialize at least the top level suite stats....
http://code.google.com/p/robotframework/source/detail?r=d6a2ed4cc261
Revision: d8a0b69a8f00
Author: Pekka Klärck
Date: Fri Jun 17 07:00:12 2011
Log: updated help texts to match current semantics
http://code.google.com/p/robotframework/source/detail?r=d8a0b69a8f00
Revision: 5885756bd9c6
Author: Pekka Klärck
Date: Fri Jun 17 07:00:22 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=5885756bd9c6
==============================================================================
Revision: 3a26bb9a3060
Author: Pekka Klärck
Date: Fri Jun 17 05:33:27 2011
Log: Serialize tag stats also when --tagstat(in|ex)clude has removed
all tags. In practice this means that tag stat table is always shown in
log/report (earlier viewing logs/reporst failed). Not showing the table in
certain situation could be done in view layer but I think the table can be
shown always.
http://code.google.com/p/robotframework/source/detail?r=3a26bb9a3060
Modified:
/src/robot/common/statistics.py
=======================================
--- /src/robot/common/statistics.py Thu Jun 16 07:21:33 2011
+++ /src/robot/common/statistics.py Fri Jun 17 05:33:27 2011
@@ -204,12 +204,8 @@
self.stats[name].add_test(test)
def serialize(self, serializer):
- if not self.stats and (self._include or self._exclude):
- return
serializer.start_tag_stats(self)
- stats = self.stats.values()
- stats.sort()
- for stat in stats:
+ for stat in sorted(self.stats.values()):
stat.serialize(serializer)
serializer.end_tag_stats(self)
==============================================================================
Revision: d6a2ed4cc261
Author: Pekka Klärck
Date: Fri Jun 17 06:59:50 2011
Log: Always serialize at least the top level suite stats.
In practice that means that suite statistics table is always shown.
With earlier 2.6 versions showing log/report failed if --suitestatlevel was
0.
Update issue 877
Status: Started
Suite statistics table is always shown.
http://code.google.com/p/robotframework/source/detail?r=d6a2ed4cc261
Modified:
/src/robot/common/statistics.py
/src/robot/conf/settings.py
=======================================
--- /src/robot/common/statistics.py Fri Jun 17 05:33:27 2011
+++ /src/robot/common/statistics.py Fri Jun 17 06:59:50 2011
@@ -142,8 +142,6 @@
tag_stats.add_test(test, suite.critical)
def serialize(self, serializer):
- if self._suite_stat_level == 0:
- return
serializer.start_suite_stats(self)
self._serialize(serializer, self._suite_stat_level)
serializer.end_suite_stats(self)
=======================================
--- /src/robot/conf/settings.py Thu Jun 16 07:30:30 2011
+++ /src/robot/conf/settings.py Fri Jun 17 06:59:50 2011
@@ -88,7 +88,7 @@
if name == 'OutputDir':
return utils.abspath(value)
if name in ['SuiteStatLevel', 'MonitorWidth']:
- return self._convert_to_integer(name, value)
+ return self._convert_to_positive_integer(name, value)
if name in ['Listeners', 'VariableFiles']:
return [self._split_args_from_name(item) for item in value]
if name == 'TagStatLink':
@@ -161,6 +161,10 @@
"Expected 'tag:link:title' but got '%s'." %
item)
return ret
+ def _convert_to_positive_integer(self, name, value):
+ value = self._convert_to_integer(name, value)
+ return value if value > 0 else 1
+
def _convert_to_integer(self, name, value):
try:
return int(value)
==============================================================================
Revision: d8a0b69a8f00
Author: Pekka Klärck
Date: Fri Jun 17 07:00:12 2011
Log: updated help texts to match current semantics
http://code.google.com/p/robotframework/source/detail?r=d8a0b69a8f00
Modified:
/src/robot/rebot.py
/src/robot/runner.py
=======================================
--- /src/robot/rebot.py Fri Jun 10 15:23:29 2011
+++ /src/robot/rebot.py Fri Jun 17 07:00:12 2011
@@ -119,44 +119,42 @@
-L --loglevel level Threshold for selecting messages. Available
levels:
TRACE (default), DEBUG, INFO, WARN, NONE (no
msgs)
--suitestatlevel level How many levels to show in 'Statistics by
Suite'
- table in outputs. By default all suite levels are
- shown. If zero (0) is given the whole table is
- removed. Example: '--suitestatlevel 3'
- --tagstatinclude tag * Include only these tags in 'Statistics by Tag'
and
- and 'Test Details by Tag' tables in outputs. By
- default all tags set in test cases are shown.
Given
- 'tag' can also be a simple pattern (see e.g.
--test).
- --tagstatexclude tag * Exclude these tags from 'Statistics by Tag' and
- 'Test Details by Tag' tables in outputs. This
option
- can be used with --tagstatinclude similarly as
- --exclude is used with --include.
+ in log and report. By default all suite levels
are
+ shown. Example: --suitestatlevel 3
+ --tagstatinclude tag * Include only matching tags in 'Statistics by
Tag'
+ and 'Test Details' in log and report. By default
all
+ tags set in test cases are shown. Given 'tag' can
+ also be a simple pattern (see e.g. --test).
+ --tagstatexclude tag * Exclude matching tags from 'Statistics by Tag'
and
+ 'Test Details'. This option can be used with
+ --tagstatinclude similarly as --exclude is used
with
+ --include.
--tagstatcombine tags:name * Create combined statistics based on tags.
These statistics are added into 'Statistics by
Tag'
- table and matching tests into 'Test Details by
Tag'
- table. Unless the optional 'name' is used, name
of
- the added combined tag is got from specified
tags.
- Tags are combined using the rules explained in
- --include.
+ and matching tests into 'Test Details'. If
optional
+ 'name' is not given, name of the combined tag is
got
+ from the specified tags. Tags are combined using
the
+ rules explained in --include.
+ Examples: --tagstatcombine tag1ANDtag2:My_name
+ --tagstatcombine requirement-*
--tagdoc pattern:doc * Add documentation to tags matching given
pattern.
- Documentation is shown in 'Test Details by Tag'
- table and also as a tooltip in 'Statistics by
Tag'
- table. Pattern can contain characters '*'
(matches
- anything) and '?' (matches any char). In case of
- multiple matches, documentations are catenated
with
- spaces. Documentation can contain formatting as
with
- --doc option.
+ Documentation is shown in 'Test Details' and
also as
+ a tooltip in 'Statistics by Tag'. Pattern can
contain
+ characters '*' (matches anything) and '?'
(matches
+ any char). If one tag matches multiple patterns,
its
+ docs are catenated with spaces. Documentation can
+ contain formatting similarly as with --doc
option.
Examples: --tagdoc mytag:My_documentation
--tagdoc
regression:*See*_http://info.html
--tagdoc owner-*:Original_author
- --tagstatlink pattern:link:title * Adds links into 'Statistics by Tag'
- table in outputs. Pattern can contain
characters '*'
- (matches anything) and '?' (matches any
character).
- Character(s) matching to wildcard expression(s)
can
- be used in the resulting link with syntax %N,
where N
- is the index of the match (starting from 1). In
title
+ --tagstatlink pattern:link:title * Add external links
into 'Statistics by
+ Tag'. Pattern can contain characters '*' (matches
+ anything) and '?' (matches any char). Characters
+ matching to wildcard expressions can be used in
the
+ resulting link with syntax %N, where N is the
index
+ of the match (starting from 1). In the 'title'
underscores are automatically converted to
spaces.
- Examples:
- --tagstatlink mytag:http://my.domain:Link
+ Examples: --tagstatlink
mytag:http://my.domain:Link
--tagstatlink
bug-*:http://tracker/id=%1:Bug_Tracker
--removekeywords all|passed Remove keyword data from generated
outputs.
Keyword data is not needed when creating reports
and
=======================================
--- /src/robot/runner.py Tue Jun 14 09:27:02 2011
+++ /src/robot/runner.py Fri Jun 17 07:00:12 2011
@@ -164,44 +164,42 @@
-L --loglevel level Threshold level for logging. Available levels:
TRACE, DEBUG, INFO (default), WARN, NONE (no
logging)
--suitestatlevel level How many levels to show in 'Statistics by
Suite'
- table in outputs. By default all suite levels are
- shown. If zero (0) is given the whole table is
- removed. Example: '--SuiteStatLevel 3'
- --tagstatinclude tag * Include only these tags in 'Statistics by Tag'
and
- and 'Test Details by Tag' tables in outputs. By
- default all tags set in test cases are shown.
Given
- 'tag' can also be a simple pattern (see e.g.
--test).
- --tagstatexclude tag * Exclude these tags from 'Statistics by Tag' and
- 'Test Details by Tag' tables in outputs. This
option
- can be used with --tagstatinclude similarly as
- --exclude is used with --include.
+ in log and report. By default all suite levels
are
+ shown. Example: --suitestatlevel 3
+ --tagstatinclude tag * Include only matching tags in 'Statistics by
Tag'
+ and 'Test Details' in log and report. By default
all
+ tags set in test cases are shown. Given 'tag' can
+ also be a simple pattern (see e.g. --test).
+ --tagstatexclude tag * Exclude matching tags from 'Statistics by Tag'
and
+ 'Test Details'. This option can be used with
+ --tagstatinclude similarly as --exclude is used
with
+ --include.
--tagstatcombine tags:name * Create combined statistics based on tags.
These statistics are added into 'Statistics by
Tag'
- table and matching tests into 'Test Details by
Tag'
- table. Unless the optional 'name' is used, name
of
- the added combined tag is got from specified
tags.
- Tags are combined using the rules explained in
- --include.
+ and matching tests into 'Test Details'. If
optional
+ 'name' is not given, name of the combined tag is
got
+ from the specified tags. Tags are combined using
the
+ rules explained in --include.
+ Examples: --tagstatcombine tag1ANDtag2:My_name
+ --tagstatcombine requirement-*
--tagdoc pattern:doc * Add documentation to tags matching given
pattern.
- Documentation is shown in 'Test Details by Tag'
- table and also as a tooltip in 'Statistics by
Tag'
- table. Pattern can contain characters '*'
(matches
- anything) and '?' (matches any char). In case of
- multiple matches, documentations are catenated
with
- spaces. Documentation can contain formatting as
with
- --doc option.
+ Documentation is shown in 'Test Details' and
also as
+ a tooltip in 'Statistics by Tag'. Pattern can
contain
+ characters '*' (matches anything) and '?'
(matches
+ any char). If one tag matches multiple patterns,
its
+ docs are catenated with spaces. Documentation can
+ contain formatting similarly as with --doc
option.
Examples: --tagdoc mytag:My_documentation
--tagdoc
regression:*See*_http://info.html
--tagdoc owner-*:Original_author
--tagstatlink pattern:link:title * Add external links
into 'Statistics by
- Tag' table in outputs. Pattern can contain
characters
- '*' (matches anything) and '?' (matches any
char).
- Character(s) matching to wildcard expression(s)
can
- be used in the resulting link with syntax %N,
where N
- is the index of the match (starting from 1). In
title
+ Tag'. Pattern can contain characters '*' (matches
+ anything) and '?' (matches any char). Characters
+ matching to wildcard expressions can be used in
the
+ resulting link with syntax %N, where N is the
index
+ of the match (starting from 1). In the 'title'
underscores are automatically converted to
spaces.
- Examples:
- --tagstatlink mytag:http://my.domain:Link
+ Examples: --tagstatlink
mytag:http://my.domain:Link
--tagstatlink
bug-*:http://tracker/id=%1:Bug_Tracker
--listener class * A class for monitoring test execution. Gets
notifications e.g. when a test case starts and
ends.
==============================================================================
Revision: 5885756bd9c6
Author: Pekka Klärck
Date: Fri Jun 17 07:00:22 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=5885756bd9c6
