Author: pekka.klarck
Date: Wed Mar 25 04:12:49 2009
New Revision: 1529
Modified:
trunk/src/robot/common/model.py
trunk/src/robot/output/readers.py
trunk/src/robot/output/xmllogger.py
trunk/src/robot/serializing/serializer.py
Log:
removed writing filtering/criticality information to output and log
Modified: trunk/src/robot/common/model.py
==============================================================================
--- trunk/src/robot/common/model.py (original)
+++ trunk/src/robot/common/model.py Wed Mar 25 04:12:49 2009
@@ -69,7 +69,6 @@
self.suites = []
self.tests = []
self.critical = _Critical()
- self.filtered = _FilteredBy()
self.critical_stats = Stat()
self.all_stats = Stat()
@@ -203,8 +202,6 @@
self._raise_no_tests_filtered_by_names(suites, tests)
def _filter_by_names(self, suites, tests):
- self.filtered.add_suites(self._suite_filters_to_str(suites))
- self.filtered.add_tests(tests)
suites = self._filter_suite_names(suites)
self.suites = [ suite for suite in self.suites
if suite._filter_by_names(suites, tests) ]
@@ -230,7 +227,8 @@
def _raise_no_tests_filtered_by_names(self, suites, tests):
tests = utils.seq2str(tests, lastsep=' or ')
- suites = utils.seq2str(self._suite_filters_to_str(suites),
lastsep=' or ')
+ suites = utils.seq2str([ '.'.join(p + s) for p, s in suites ],
+ lastsep=' or ')
if not suites:
msg = 'test cases named %s.' % tests
elif not tests:
@@ -239,9 +237,6 @@
msg = 'test cases %s in suites %s.' % (tests, suites)
raise DataError("Suite '%s' contains no %s" % (self.name, msg))
- def _suite_filters_to_str(self, suites):
- return [ '.'.join(p + s) for p, s in suites ]
-
def filter_by_tags(self, includes=None, excludes=None):
if includes is None: includes = []
if excludes is None: excludes = []
@@ -251,8 +246,6 @@
self._raise_no_tests_filtered_by_tags(includes, excludes)
def _filter_by_tags(self, incls, excls):
- self.filtered.add_incls(incls)
- self.filtered.add_excls(excls)
self.suites = [ suite for suite in self.suites
if suite._filter_by_tags(incls, excls) ]
self.tests = [ test for test in self.tests
@@ -408,25 +401,3 @@
if self.is_critical(tag):
return True
return len(self.tags) == 0
-
-
-class _FilteredBy:
-
- def __init__(self):
- self.tests = []
- self.suites = []
- self.incls = []
- self.excls = []
-
- def add_tests(self, tests):
- self.tests = utils.normalize_list(self.tests + tests, ignore=['_'])
-
- def add_suites(self, suites):
- self.suites = utils.normalize_list(self.suites + suites,
ignore=['_'])
-
- def add_incls(self, incls):
- self.incls = utils.normalize_list(self.incls + incls)
-
- def add_excls(self, excls):
- self.excls = utils.normalize_list(self.excls + excls)
-
Modified: trunk/src/robot/output/readers.py
==============================================================================
--- trunk/src/robot/output/readers.py (original)
+++ trunk/src/robot/output/readers.py Wed Mar 25 04:12:49 2009
@@ -113,12 +113,6 @@
del(self.keywords)
for metanode in node.get_nodes('metadata/item'):
self.metadata[metanode.get_attr('name')] = metanode.text
- self.critical.tags = self._get_texts(node, 'critical/tag')
- self.critical.nons = self._get_texts(node, 'critical/non')
- self.filtered.suites = self._get_texts(node, 'filtered/suite')
- self.filtered.tests = self._get_texts(node, 'filtered/test')
- self.filtered.incls = self._get_texts(node, 'filtered/incl')
- self.filtered.excls = self._get_texts(node, 'filtered/excl')
def _get_texts(self, node, path):
return [ item.text for item in node.get_nodes(path) ]
Modified: trunk/src/robot/output/xmllogger.py
==============================================================================
--- trunk/src/robot/output/xmllogger.py (original)
+++ trunk/src/robot/output/xmllogger.py Wed Mar 25 04:12:49 2009
@@ -96,16 +96,6 @@
for name, value in suite.get_metadata():
self._writer.whole_element('item', value, {'name': name})
self._writer.end_element('metadata')
- self._writer.start_element('critical')
- self._write_list('tag', suite.critical.tags)
- self._write_list('non', suite.critical.nons)
- self._writer.end_element('critical')
- self._writer.start_element('filtered')
- self._write_list('suite', suite.filtered.suites)
- self._write_list('test', suite.filtered.tests)
- self._write_list('incl', suite.filtered.incls)
- self._write_list('excl', suite.filtered.excls)
- self._writer.end_element('filtered')
def end_suite(self, suite):
self._suite_level -= 1
Modified: trunk/src/robot/serializing/serializer.py
==============================================================================
--- trunk/src/robot/serializing/serializer.py (original)
+++ trunk/src/robot/serializing/serializer.py Wed Mar 25 04:12:49 2009
@@ -365,13 +365,6 @@
self._start_suite_or_test_metadata(suite)
for name, value in suite.get_metadata(html=True):
self._write_metadata_row(name, value, escape=False,
write_empty=True)
- for title, values in [ ('Critical Tags', suite.critical.tags),
- ('Non-Critical Tags', suite.critical.nons),
- ('Included Suites', suite.filtered.suites),
- ('Included Tests', suite.filtered.tests),
- ('Included Tags', suite.filtered.incls),
- ('Excluded Tags', suite.filtered.excls) ]:
- self._write_metadata_row(title, ', '.join(values),
escape=False)
self._write_times(suite)
self._write_metadata_row('Overall Status', suite.status,
{'class': suite.status.lower()})
@@ -594,16 +587,6 @@
self._writer.whole_element('span', '%s: ' % name,
{'class': 'meta_name'})
self._writer.content(value, escape=False)
- self._writer.start_and_end_element('br')
- for name, values in [ ('Critical', suite.critical.tags),
- ('Non-Critical', suite.critical.nons),
- ('Suites', suite.filtered.suites),
- ('Tests', suite.filtered.tests),
- ('Include', suite.filtered.incls),
- ('Exclude', suite.filtered.excls) ]:
- if values == []: continue
- self._writer.whole_element('span', '%s: ' % name,
{'class': 'meta_name'})
- self._writer.content(u', '.join(values))
self._writer.start_and_end_element('br')
self._writer.end_element('td')
self._writer.whole_element('td', 'N/A', {'class': 'col_crit
not_available'})
