Revision: 3714
Author: pekka.klarck
Date: Mon Jun 7 03:58:10 2010
Log: added test_template to __iter__, tuned setting order
http://code.google.com/p/robotframework/source/detail?r=3714
Modified:
/trunk/src/robot/parsing/model.py
=======================================
--- /trunk/src/robot/parsing/model.py Mon Jun 7 03:34:17 2010
+++ /trunk/src/robot/parsing/model.py Mon Jun 7 03:58:10 2010
@@ -229,10 +229,10 @@
self.suite_teardown = Fixture(self)
self.test_setup = Fixture(self)
self.test_teardown = Fixture(self)
- self.test_timeout = Timeout(self)
- self.test_template = Template(self)
self.force_tags = Tags(self)
self.default_tags = Tags(self)
+ self.test_template = Template(self)
+ self.test_timeout = Timeout(self)
self.metadata = []
self.imports = []
self._setters = self._get_setters()
@@ -276,9 +276,9 @@
'Test Precondition':
self.test_setup.set,
'Test Teardown':
self.test_teardown.set,
'Test Postcondition':
self.test_teardown.set,
- 'Test Template':
self.test_template.set,
'Force Tags': self.force_tags.set,
'Default Tags': self.default_tags.set,
+ 'Test Template':
self.test_template.set,
'Test Timeout': self.test_timeout.set,
'Library':
self._get_adder(self.add_library),
'Resource':
self._get_adder(self.add_resource),
@@ -287,8 +287,8 @@
def __iter__(self):
for setting in [self.doc, self.suite_setup, self.suite_teardown,
- self.test_setup, self.test_teardown,
self.test_timeout,
- self.force_tags, self.default_tags] \
+ self.test_setup, self.test_teardown,
self.force_tags,
+ self.default_tags, self.test_template,
self.test_timeout] \
+ self.metadata + self.imports:
yield setting
