From a778269bc3d0c11f3c98697f119cf9f76355353b Mon Sep 17 00:00:00 2001 From: Ismail Ibrahim Quwarah Date: Wed, 18 Sep 2024 10:28:35 +0200 Subject: [PATCH] Move check & exception deeper --- tmt/base.py | 7 ++++++- tmt/steps/prepare/ansible.py | 9 +-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tmt/base.py b/tmt/base.py index 7aa07407c1..aad368b4a4 100644 --- a/tmt/base.py +++ b/tmt/base.py @@ -772,7 +772,12 @@ def _fmf_id(self) -> None: # TODO: cached_property candidates @property def fmf_root(self) -> Path: - return Path(self.node.root) + # Check if fmf root exists + try: + return Path(self.node.root) + except TypeError: + raise tmt.utils.GeneralError( + "No fmf root found. Directory is not initialized with `tmt init`") @property def git_root(self) -> Optional[Path]: diff --git a/tmt/steps/prepare/ansible.py b/tmt/steps/prepare/ansible.py index 04ae09d07f..3faef38530 100644 --- a/tmt/steps/prepare/ansible.py +++ b/tmt/steps/prepare/ansible.py @@ -166,16 +166,9 @@ def go( logger.info('playbook-path', playbook_path, 'green') - # Check if fmf root exists - try: - playbook_root = self.step.plan.fmf_root - except TypeError: - raise PrepareError( - "No fmf root found. Directory is not initialized with `tmt init`") - guest.ansible( playbook_path, - playbook_root=playbook_root, + playbook_root=self.step.plan.fmf_root, extra_args=self.data.extra_args) return results