Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Error no test suites #158

Merged
merged 2 commits into from
Nov 27, 2023
Merged

Error no test suites #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
193c794
Error if no test suites found
rubenrua Nov 27, 2023
269b899
installed: Iterate over all site data dirs
rubenrua Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions fluster/fluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ def _load_test_suites(self) -> None:
self.test_suites.append(test_suite)
except Exception as ex:
print(f"Error loading test suite {file}: {ex}")
if len(self.test_suites) == 0:
raise Exception(f'No test suites found in "{self.test_suites_dir}"')

def list_decoders(self, check: bool, verbose: bool) -> None:
"""List all the available decoders"""
Expand Down
9 changes: 6 additions & 3 deletions fluster/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,14 @@ def _validate_deps(self, args: Any) -> None:
)

def _get_installed_dirs(self) -> Tuple[str, str]:
site_data_dir = utils.site_data_dir(APPNAME)
site_data_dirs = utils.site_data_dirs(APPNAME)
user_data_dir = utils.user_data_dir(APPNAME)

test_suites_dir = os.path.join(site_data_dir, TEST_SUITES_DIR)
if not os.path.exists(test_suites_dir):
for site_data_dir in site_data_dirs:
test_suites_dir = os.path.join(site_data_dir, TEST_SUITES_DIR)
if os.path.exists(test_suites_dir):
break
else:
test_suites_dir = os.path.join(user_data_dir, TEST_SUITES_DIR)

resources_dir = os.path.join(user_data_dir, RESOURCES_DIR)
Expand Down
16 changes: 11 additions & 5 deletions fluster/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,13 @@ def _linux_user_data_dir(appname: str) -> str:
return os.path.join(path, appname)


def _linux_site_data_dir(appname: str) -> str:
def _linux_site_data_dirs(appname: str) -> List[str]:
"""Return data directory shared by users"""
path = os.environ.get("XDG_DATA_DIRS", "")
if not path.strip():
path = "/usr/local/share:/usr/share"
path = path.split(os.pathsep)[0]
return os.path.join(path, appname)
paths = path.split(os.pathsep)
return [os.path.join(p, appname) for p in paths]


def _win_user_data_dir(appname: str) -> str:
Expand All @@ -166,9 +166,15 @@ def _win_user_data_dir(appname: str) -> str:
return os.path.join(path, appname)


def _win_site_data_dirs(appname: str) -> List[str]:
"""Return data directory shared by users"""
# On Windows always user_data_dir
return [_win_user_data_dir(appname)]
rgonzalezfluendo marked this conversation as resolved.
Show resolved Hide resolved


if sys.platform == "win32":
site_data_dir = _win_user_data_dir # On Windows always user_data_dir
site_data_dirs = _win_site_data_dirs
mdimopoulos marked this conversation as resolved.
Show resolved Hide resolved
user_data_dir = _win_user_data_dir
else:
site_data_dir = _linux_site_data_dir
site_data_dirs = _linux_site_data_dirs
user_data_dir = _linux_user_data_dir
Loading