2 new revisions:
Revision: 96d3d30b52bd
Author: Jussi Malinen
Date: Mon Jun 13 04:52:41 2011
Log: keep failed teardowns in report to fail tests if suite teardown
failed
http://code.google.com/p/robotframework/source/detail?r=96d3d30b52bd
Revision: 9183570872ea
Author: Jussi Malinen
Date: Mon Jun 13 04:52:59 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=9183570872ea
==============================================================================
Revision: 96d3d30b52bd
Author: Jussi Malinen
Date: Mon Jun 13 04:52:41 2011
Log: keep failed teardowns in report to fail tests if suite teardown
failed
http://code.google.com/p/robotframework/source/detail?r=96d3d30b52bd
Modified:
/src/robot/serializing/jsparser.py
=======================================
--- /src/robot/serializing/jsparser.py Mon Jun 13 03:03:48 2011
+++ /src/robot/serializing/jsparser.py Mon Jun 13 04:52:41 2011
@@ -468,10 +468,13 @@
def _remove_keywords_from(self, data):
if not isinstance(data, list):
return data
- return [self._remove_keywords_from(item) for item in data if not
self._is_keyword(item)]
-
- def _is_keyword(self, item):
- return isinstance(item, list) and item and item[0] in
['kw', 'setup', 'teardown']
+ return [self._remove_keywords_from(item) for item in data
+ if not self._is_ignorable_keyword(item)]
+
+ def _is_ignorable_keyword(self, item):
+ # Top level teardown is kept to make tests fail if suite teardown
failed
+ # TODO: Could we store information about failed suite teardown
otherwise?
+ return isinstance(item, list) and item and item[0] in
['kw', 'setup']
def _prune_unused_texts(self):
used = self._collect_used_text_indices(self._robot_data, set())
==============================================================================
Revision: 9183570872ea
Author: Jussi Malinen
Date: Mon Jun 13 04:52:59 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=9183570872ea
