2 new revisions:
Revision: 784c550fe927
Author: Janne Härkönen <[email protected]>
Date: Thu Jun 16 03:53:56 2011
Log: Show pattern in tag details
http://code.google.com/p/robotframework/source/detail?r=784c550fe927
Revision: 5f46ae3f2c5e
Author: Janne Härkönen <[email protected]>
Date: Thu Jun 16 03:54:33 2011
Log: statistics: format tag combine pattern before writing it to XML
http://code.google.com/p/robotframework/source/detail?r=5f46ae3f2c5e
==============================================================================
Revision: 784c550fe927
Author: Janne Härkönen <[email protected]>
Date: Thu Jun 16 03:53:56 2011
Log: Show pattern in tag details
http://code.google.com/p/robotframework/source/detail?r=784c550fe927
Modified:
/src/robot/webcontent/report.html
=======================================
--- /src/robot/webcontent/report.html Wed Jun 15 15:26:32 2011
+++ /src/robot/webcontent/report.html Thu Jun 16 03:53:56 2011
@@ -475,16 +475,22 @@
<td>{{html doc}}</td>
</tr>
{{/if}}
+ {{if pattern}}
<tr>
- <th>Status:</th>
- <td>${total} total, ${pass} passed, {{if fail}}<span
class="fail">${fail} failed</span>{{else}}<span class="pass">0
failed</span>{{/if}}</td>
+ <th>Combined:</th>
+ <td>${pattern}</td>
</tr>
+ {{/if}}
{{if links && links.length}}
<tr>
<th>Links:</th>
<td>{{each links}}<a href="${$value.url}"
title="${$value.url}">${$value.title}</a>{{/each}} </td>
</tr>
{{/if}}
+ <tr>
+ <th>Status:</th>
+ <td>${total} total, ${pass} passed, {{if fail}}<span
class="fail">${fail} failed</span>{{else}}<span class="pass">0
failed</span>{{/if}}</td>
+ </tr>
<tr>
<th>Total Time:</th>
<td>${totalTime}</td>
==============================================================================
Revision: 5f46ae3f2c5e
Author: Janne Härkönen <[email protected]>
Date: Thu Jun 16 03:54:33 2011
Log: statistics: format tag combine pattern before writing it to XML
http://code.google.com/p/robotframework/source/detail?r=5f46ae3f2c5e
Modified:
/src/robot/common/statistics.py
/src/robot/conf/settings.py
=======================================
--- /src/robot/common/statistics.py Thu Jun 16 02:19:32 2011
+++ /src/robot/common/statistics.py Thu Jun 16 03:54:33 2011
@@ -186,21 +186,10 @@
for option in tag_stat_combine_options ]
def _parse_name_and_pattern_from(self, option):
- pattern, name = self._split_pattern_and_name(option)
- name = self._get_name(pattern, name)
- return pattern, name
-
- def _split_pattern_and_name(self, pattern):
- option_separator = ':'
- if not option_separator in pattern:
- return pattern, pattern
- index = pattern.rfind(option_separator)
- return pattern[:index], pattern[index+1:]
-
- def _get_name(self, pattern, name):
- if pattern != name:
- return name.replace('_', ' ')
- return name.replace('&', ' & ').replace('NOT', ' NOT ')
+ pattern = option.replace('&', ' & ').replace('NOT', ' NOT ')
+ if ':' in pattern:
+ return pattern.rsplit(':', 1)
+ return pattern, pattern
def add_test(self, test, critical):
self._add_tags_statistics(test, critical)
=======================================
--- /src/robot/conf/settings.py Wed Jun 15 04:29:13 2011
+++ /src/robot/conf/settings.py Thu Jun 16 03:54:33 2011
@@ -82,7 +82,7 @@
if name in ['Metadata', 'TagDoc']:
return [v.replace('_', ' ') for v in value]
if name in ['Include', 'Exclude', 'TagStatCombine']:
- return [item.replace('AND', '&') for item in value]
+ return [item.replace('AND', '&').replace('_', ' ') for item in
value]
if name in self._output_opts and utils.eq(value, 'NONE'):
return 'NONE'
if name == 'OutputDir':
