diff options
-rw-r--r-- | meta/lib/oeqa/core/loader.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py index a4744dee03..98fc0f696a 100644 --- a/meta/lib/oeqa/core/loader.py +++ b/meta/lib/oeqa/core/loader.py | |||
@@ -155,7 +155,16 @@ class OETestLoader(unittest.TestLoader): | |||
155 | class_name = case.__class__.__name__ | 155 | class_name = case.__class__.__name__ |
156 | test_name = case._testMethodName | 156 | test_name = case._testMethodName |
157 | 157 | ||
158 | if self.modules: | 158 | # 'auto' is a reserved key word to run test cases automatically |
159 | # warn users if their test case belong to a module named 'auto' | ||
160 | if module_name_small == "auto": | ||
161 | bb.warn("'auto' is a reserved key word for TEST_SUITES. " | ||
162 | "But test case '%s' is detected to belong to auto module. " | ||
163 | "Please condier using a new name for your module." % str(case)) | ||
164 | |||
165 | # check if case belongs to any specified module | ||
166 | # if 'auto' is specified, such check is skipped | ||
167 | if self.modules and not 'auto' in self.modules: | ||
159 | module = None | 168 | module = None |
160 | try: | 169 | try: |
161 | module = self.modules[module_name_small] | 170 | module = self.modules[module_name_small] |
@@ -245,7 +254,7 @@ class OETestLoader(unittest.TestLoader): | |||
245 | for tcName in testCaseNames: | 254 | for tcName in testCaseNames: |
246 | case = self._getTestCase(testCaseClass, tcName) | 255 | case = self._getTestCase(testCaseClass, tcName) |
247 | # Filer by case id | 256 | # Filer by case id |
248 | if not (self.tests and not 'all' in self.tests | 257 | if not (self.tests and not 'auto' in self.tests |
249 | and not getCaseID(case) in self.tests): | 258 | and not getCaseID(case) in self.tests): |
250 | self._handleTestCaseDecorators(case) | 259 | self._handleTestCaseDecorators(case) |
251 | 260 | ||
@@ -309,14 +318,14 @@ class OETestLoader(unittest.TestLoader): | |||
309 | module_name = module.__name__ | 318 | module_name = module.__name__ |
310 | 319 | ||
311 | # Normal test modules are loaded if no modules were specified, | 320 | # Normal test modules are loaded if no modules were specified, |
312 | # if module is in the specified module list or if 'all' is in | 321 | # if module is in the specified module list or if 'auto' is in |
313 | # module list. | 322 | # module list. |
314 | # Underscore modules are loaded only if specified in module list. | 323 | # Underscore modules are loaded only if specified in module list. |
315 | load_module = True if not module_name.startswith('_') \ | 324 | load_module = True if not module_name.startswith('_') \ |
316 | and (not self.modules \ | 325 | and (not self.modules \ |
317 | or module_name in self.modules \ | 326 | or module_name in self.modules \ |
318 | or module_name_small in self.modules \ | 327 | or module_name_small in self.modules \ |
319 | or 'all' in self.modules) \ | 328 | or 'auto' in self.modules) \ |
320 | else False | 329 | else False |
321 | 330 | ||
322 | load_underscore = True if module_name.startswith('_') \ | 331 | load_underscore = True if module_name.startswith('_') \ |