2 new revisions:
Revision: f6cd4dc2b2b7
Branch: default
Author: Tatu Kairi <[email protected]>
Date: Thu May 30 07:06:28 2013
Log: Building: raise error if empty suites
http://code.google.com/p/robotframework/source/detail?r=f6cd4dc2b2b7
Revision: 1486732239a2
Branch: default
Author: Tatu Kairi <[email protected]>
Date: Thu May 30 07:06:36 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=1486732239a2
==============================================================================
Revision: f6cd4dc2b2b7
Branch: default
Author: Tatu Kairi <[email protected]>
Date: Thu May 30 07:06:28 2013
Log: Building: raise error if empty suites
http://code.google.com/p/robotframework/source/detail?r=f6cd4dc2b2b7
Modified:
/src/robot/model/configurer.py
/src/robot/new_running/builder.py
/src/robot/run.py
=======================================
--- /src/robot/model/configurer.py Wed May 29 14:44:17 2013
+++ /src/robot/model/configurer.py Thu May 30 07:06:28 2013
@@ -49,7 +49,6 @@
self._filter(suite)
suite.set_tags(self.add_tags, self.remove_tags)
suite.set_criticality(self.critical_tags, self.non_critical_tags)
- suite.remove_empty_suites()
def _set_suite_attributes(self, suite):
if self.name:
=======================================
--- /src/robot/new_running/builder.py Wed May 29 13:42:55 2013
+++ /src/robot/new_running/builder.py Thu May 30 07:06:28 2013
@@ -22,18 +22,31 @@
class TestSuiteBuilder(object):
- def __init__(self, include_suites=None, warn_on_skipped=False):
+ def __init__(self, include_suites=None, warn_on_skipped=False,
include_empty_suites=False):
self.include_suites = include_suites
self.warn_on_skipped = warn_on_skipped
+ self.include_empty_suites = include_empty_suites
def build(self, *paths):
if len(paths) == 1:
- return self._build_suite(self._parse(paths[0]))
+ return self._build_and_check_if_empty(paths[0])
root = TestSuite()
for path in paths:
- root.suites.append(self._build_suite(self._parse(path)))
+ root.suites.append(self._build_and_check_if_empty(path))
return root
+ def _build_and_check_if_empty(self, path):
+ builded = self._build_suite(self._parse(path))
+ if not self._empty_suites_allowed and not builded.test_count:
+ raise DataError("Suite '%s' contains no tests." %
builded.name)
+ builded.remove_empty_suites()
+ return builded
+
+ @property
+ def _empty_suites_allowed(self):
+ return self.include_empty_suites or self.include_suites
+
+
def _parse(self, path):
try:
return TestData(source=abspath(path),
=======================================
--- /src/robot/run.py Thu May 30 05:22:00 2013
+++ /src/robot/run.py Thu May 30 07:06:28 2013
@@ -392,7 +392,8 @@
stderr=settings['StdErr'])
LOGGER.info('Settings:\n%s' % unicode(settings))
suite = TestSuiteBuilder(settings['SuiteNames'],
-
settings['WarnOnSkipped']).build(*datasources)
+ settings['WarnOnSkipped'],
+
settings['RunEmptySuite']).build(*datasources)
suite.configure(**settings.suite_config)
result = suite.run(settings)
result.configure(status_rc=settings.status_rc)
==============================================================================
Revision: 1486732239a2
Branch: default
Author: Tatu Kairi <[email protected]>
Date: Thu May 30 07:06:36 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=1486732239a2
Modified:
/src/robot/run.py
=======================================
--- /src/robot/run.py Thu May 30 06:39:34 2013
+++ /src/robot/run.py Thu May 30 07:06:36 2013
@@ -392,7 +392,8 @@
stderr=settings['StdErr'])
LOGGER.info('Settings:\n%s' % unicode(settings))
suite = TestSuiteBuilder(settings['SuiteNames'],
-
settings['WarnOnSkipped']).build(*datasources)
+ settings['WarnOnSkipped'],
+
settings['RunEmptySuite']).build(*datasources)
suite.configure(**settings.suite_config)
result = suite.run(settings)
result.configure(status_rc=settings.status_rc,
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
