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

Report the name of an unreadable directory. #1522

Closed
wants to merge 5 commits into from
Closed

Report the name of an unreadable directory. #1522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d40a3c6
Report the name of an unreadable directory.
simonjwright Dec 31, 2023
4b7e73a
Update test for new 'not a readable directory' report format.
simonjwright Dec 31, 2023
5c40352
Include test directory in expected text.
simonjwright Dec 31, 2023
c7221e0
Make the input directory name match what is expected.
simonjwright Dec 31, 2023
c3be781
Adjust the path for comparison.
simonjwright Dec 31, 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: 1 addition & 1 deletion src/alire/alire-index_on_disk.adb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ package body Alire.Index_On_Disk is
Dir : constant Virtual_File := Create (+Path);
begin
if not Dir.Is_Directory then
Result := Outcome_Failure ("Not a readable directory");
Result := Outcome_Failure ("Not a readable directory: " & Path);
return New_Invalid_Index;
end if;

Expand Down
9 changes: 7 additions & 2 deletions testsuite/tests/index/local-index-not-found/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
from drivers.alr import prepare_indexes, run_alr
from drivers.asserts import assert_match

def comparator(param):
"""If the test value (in d) is 'no-such-directory', the value tested for
is './no-such-directory'; if not, it's left as it is."""
if param == 'no-such-directory': return './no-such-directory'
return param

for d in ('no-such-directory',
'file://no-such-directory', ):
Expand All @@ -21,9 +26,9 @@
path_excerpt = os.path.join('alr-config', 'indexes', 'bad_index',
'index.toml')
assert_match('ERROR: Cannot load metadata from .*{}:'
' Not a readable directory'
' Not a readable directory: {}'
'\n'
.format(re.escape(path_excerpt)),
.format(re.escape(path_excerpt), comparator(d)),
p.out)

print('SUCCESS')
Loading