local-it/e2e_tests
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove _dependency_runners from runner

Browse source
This commit is contained in:
Daniel 2023-12-05 23:56:44 +01:00
parent db2a34c7a7
commit 1bc8849cc9
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
abratest/coordinator.py
View file

@ -44,12 +44,7 @@ class Coordinator:
runners: list[Runner] = [] runners: list[Runner] = []
for index, env_file in enumerate(env_files): for index, env_file in enumerate(env_files):
RunnerClass = self.RUNNER_DICT[env_file.config["TYPE"]] RunnerClass = self.RUNNER_DICT[env_file.config["TYPE"]]
dependency_classes: list[type[Runner]] = [] runners.append(RunnerClass(coordinator=self, runner_index=index))
for dependency in RunnerClass.dependencies:
dependency_classes.append(self.RUNNER_DICT[dependency])
runner_instance = RunnerClass(coordinator=self, runner_index=index)
runner_instance._dependency_runners = dependency_classes
runners.append(runner_instance)
return runners return runners
def combine_html(self) -> None: def combine_html(self) -> None:

5
abratest/runner.py
View file

@ -23,7 +23,6 @@ class Runner:
tests: list[Test] = [] tests: list[Test] = []
cleanups: list[Test] = [] cleanups: list[Test] = []
dependencies: list[str] = [] dependencies: list[str] = []
_dependency_runners: list[type["Runner"]] = []
def __init__(self, coordinator: "Coordinator", runner_index: int): def __init__(self, coordinator: "Coordinator", runner_index: int):
self.coordinator = coordinator # needed? self.coordinator = coordinator # needed?
@ -31,6 +30,7 @@ class Runner:
self.DIR = coordinator.DIR self.DIR = coordinator.DIR
self.ENV = coordinator.ENV self.ENV = coordinator.ENV
self.RUNNER_DICT = coordinator.RUNNER_DICT
self.env_file: EnvFile = self.ENV.env_files[self.runner_index] self.env_file: EnvFile = self.ENV.env_files[self.runner_index]
self.dotenv_path = self.env_file.env_path self.dotenv_path = self.env_file.env_path
@ -175,7 +175,8 @@ class Runner:
passed_tests = [r.name for r in self.DIR.RESULTS.glob("*") if "passed" in r.name] passed_tests = [r.name for r in self.DIR.RESULTS.glob("*") if "passed" in r.name]
results = [] results = []
for dependency_runner in self._dependency_runners: for dependency in self.dependencies:
dependency_runner = self.coordinator.RUNNER_DICT[dependency]
for setup_name in dependency_runner.setups: for setup_name in dependency_runner.setups:
dependencie_identifier = self.combine_names(dependency_runner.env_type, setup_name.test_file) dependencie_identifier = self.combine_names(dependency_runner.env_type, setup_name.test_file)
results.append(any(dependencie_identifier in f for f in passed_tests)) results.append(any(dependencie_identifier in f for f in passed_tests))