Commit 659e90ea by Christine Lytwynec

pass opts From PythonTestSuite to NoseTestSuite

parent 8ff48868
...@@ -14,9 +14,8 @@ class PythonTestSuite(TestSuite): ...@@ -14,9 +14,8 @@ class PythonTestSuite(TestSuite):
""" """
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(PythonTestSuite, self).__init__(*args, **kwargs) super(PythonTestSuite, self).__init__(*args, **kwargs)
self.opts = kwargs
self.fasttest = kwargs.get('fasttest', False) self.fasttest = kwargs.get('fasttest', False)
self.failed_only = kwargs.get('failed_only', None)
self.fail_fast = kwargs.get('fail_fast', None)
self.subsuites = kwargs.get('subsuites', self._default_subsuites) self.subsuites = kwargs.get('subsuites', self._default_subsuites)
def __enter__(self): def __enter__(self):
...@@ -30,19 +29,13 @@ class PythonTestSuite(TestSuite): ...@@ -30,19 +29,13 @@ class PythonTestSuite(TestSuite):
The default subsuites to be run. They include lms, cms, The default subsuites to be run. They include lms, cms,
and all of the libraries in common/lib. and all of the libraries in common/lib.
""" """
opts = {
'failed_only': self.failed_only,
'fail_fast': self.fail_fast,
'fasttest': self.fasttest,
}
lib_suites = [ lib_suites = [
LibTestSuite(d, **opts) for d in Env.LIB_TEST_DIRS LibTestSuite(d, **self.opts) for d in Env.LIB_TEST_DIRS
] ]
system_suites = [ system_suites = [
SystemTestSuite('cms', **opts), SystemTestSuite('cms', **self.opts),
SystemTestSuite('lms', **opts), SystemTestSuite('lms', **self.opts),
] ]
return system_suites + lib_suites return system_suites + lib_suites
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment