Changeset View
Changeset View
Standalone View
Standalone View
test/functional/test_runner.py
| Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Lines | def find_and_run_tests(self, update_queue, run_tags, base_flags): | ||||
| continue | continue | ||||
| test_cases.append(obj) | test_cases.append(obj) | ||||
| for test_case in test_cases: | for test_case in test_cases: | ||||
| for param_set in param_sets: | for param_set in param_sets: | ||||
| test_instance = test_case() | test_instance = test_case() | ||||
| # For compatible with old test printer. | # For compatible with old test printer. | ||||
| # TODO: Update test result printing | # TODO: Update test result printing | ||||
| if hasattr(test_case, 'test_name'): | |||||
| name = test_case.test_name | |||||
| else: | |||||
| name = test_case.__name__ | |||||
| legacy_name = " ".join( | legacy_name = " ".join( | ||||
| [self.test_file, test_case.__name__] + param_set) | [self.test_file, name] + param_set) | ||||
| # Use the old name if there's only one test in the file. | # Use the old name if there's only one test in the file. | ||||
| if len(test_cases) == 1: | if len(test_cases) == 1: | ||||
| legacy_name = " ".join([self.test_file] + param_set) | legacy_name = " ".join([self.test_file] + param_set) | ||||
| update_queue.put(TestStarted(self.test_file, legacy_name)) | update_queue.put(TestStarted(self.test_file, legacy_name)) | ||||
| test_result = self.run_test( | test_result = self.run_test( | ||||
| test_instance, obj.__name__, param_set, legacy_name, base_flags, run_tags) | test_instance, name, param_set, legacy_name, base_flags, run_tags) | ||||
| update_queue.put(test_result) | update_queue.put(test_result) | ||||
| def run_test(self, test_instance, test_name, param_set, legacy_name, base_flags, run_tags): | def run_test(self, test_instance, test_name, param_set, legacy_name, base_flags, run_tags): | ||||
| time0 = time.time() | time0 = time.time() | ||||
| portseed = random.randint(2**15, 2**16) | portseed = random.randint(2**15, 2**16) | ||||
| # Setup output capturing | # Setup output capturing | ||||
| original_stdout = sys.stdout | original_stdout = sys.stdout | ||||
| original_stderr = sys.stderr | original_stderr = sys.stderr | ||||
| ▲ Show 20 Lines • Show All 551 Lines • Show Last 20 Lines | |||||