From 1bc8849cc96172f4a02012c4d68ad7664834d9db Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 5 Dec 2023 23:56:44 +0100 Subject: [PATCH] remove _dependency_runners from runner --- abratest/coordinator.py | 7 +------ abratest/runner.py | 5 +++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/abratest/coordinator.py b/abratest/coordinator.py index 82fda18..28a5102 100644 --- a/abratest/coordinator.py +++ b/abratest/coordinator.py @@ -44,12 +44,7 @@ class Coordinator: runners: list[Runner] = [] for index, env_file in enumerate(env_files): RunnerClass = self.RUNNER_DICT[env_file.config["TYPE"]] - dependency_classes: list[type[Runner]] = [] - 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) + runners.append(RunnerClass(coordinator=self, runner_index=index)) return runners def combine_html(self) -> None: diff --git a/abratest/runner.py b/abratest/runner.py index f69186b..c9cbc9e 100644 --- a/abratest/runner.py +++ b/abratest/runner.py @@ -23,7 +23,6 @@ class Runner: tests: list[Test] = [] cleanups: list[Test] = [] dependencies: list[str] = [] - _dependency_runners: list[type["Runner"]] = [] def __init__(self, coordinator: "Coordinator", runner_index: int): self.coordinator = coordinator # needed? @@ -31,6 +30,7 @@ class Runner: self.DIR = coordinator.DIR self.ENV = coordinator.ENV + self.RUNNER_DICT = coordinator.RUNNER_DICT self.env_file: EnvFile = self.ENV.env_files[self.runner_index] 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] 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: 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))