From 9190bcf62a3144489d6a02548d47879685f7db51 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Wed, 23 Mar 2016 19:34:10 +0100 Subject: [PATCH] validate:launcher: Handle testslist files even running several testsuites Only if those testsuites do not use the same Tester as we currently can't know to what testsuite a test belongs. --- validate/launcher/baseclasses.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index 6226fb7..75f9e8d 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -954,6 +954,7 @@ class TestsManager(Loggable): def _check_blacklisted(self, test): for pattern in self.blacklisted_tests_patterns: if pattern.findall(test.classname): + self.info("%s is blacklisted by %s", test.classname, pattern) return True return False @@ -1234,15 +1235,12 @@ class _TestsLauncher(Loggable): self._setup_testsuites() def _check_tester_has_other_testsuite(self, testsuite, tester): - if len(testsuite.TEST_MANAGER) > 1: - return True - if tester.name != testsuite.TEST_MANAGER[0]: return True for t in self.options.testsuites: if t != testsuite: - for other_testmanager in testsuite.TEST_MANAGER: + for other_testmanager in t.TEST_MANAGER: if other_testmanager == tester.name: return True -- 2.7.4