diff --git a/pytest_abra/cli.py b/pytest_abra/cli.py index 1ebf852..53d534b 100644 --- a/pytest_abra/cli.py +++ b/pytest_abra/cli.py @@ -49,7 +49,7 @@ def run(): recipes_dir=args.recipes_dir, timeout=args.timeout, ) - coordinator.setup_test() - coordinator.run_test() + coordinator.prepare_tests() + coordinator.run_tests() coordinator.combine_html() coordinator.collect_traces() diff --git a/pytest_abra/coordinator.py b/pytest_abra/coordinator.py index c044276..67cd776 100644 --- a/pytest_abra/coordinator.py +++ b/pytest_abra/coordinator.py @@ -32,19 +32,15 @@ class Coordinator: self.ENV = EnvManager(env_paths=env_paths, RUNNER_DICT=self.RUNNER_DICT) self.TIMEOUT = timeout - # todo: prepare tests - def setup_test(self) -> None: - logger.info("calling setup_test()") + def prepare_tests(self) -> None: + logger.info("calling prepare_tests()") self.DIR.create_all_dirs() self.ENV.copy_env_files(self.DIR) # todo: check that tests are unique # todo: create random testuser creds and load them - # todo: run setups - # todo: run tests - # todo: run cleanups - def run_test(self) -> None: - logger.info("calling run_test()") + def run_tests(self) -> None: + logger.info("calling run_tests()") self.runners: list[Runner] = self._load_runners(self.ENV.env_files) for runner in self.runners: runner.run_setups() @@ -52,7 +48,7 @@ class Coordinator: runner.run_tests() for runner in self.runners: runner.run_cleanups() - logger.info("run_test() finished") + logger.info("run_tests() finished") def _load_runners(self, env_files: list[EnvFile]) -> list[Runner]: """Creates an instance of the correct Runner class for each given env file"""