Skip to content

Fix ls with detail=False when do not support supports_empty_directories #1512

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

Merged
martindurant merged 7 commits into from
Feb 4, 2024
Merged

Fix ls with detail=False when do not support supports_empty_directories #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30d889d
Fix ls with detail=False when do not support supports_empty_directories
LuQQiu Jan 24, 2024
1e9c211
Fixes abstract/put.py
LuQQiu Jan 29, 2024
496fb01
Fixes abstract/put.py
LuQQiu Jan 29, 2024
fdeaab7
Merge branch 'master' into fix_abstract_tests
martindurant Feb 4, 2024
11f77e5
lint
martindurant Feb 4, 2024
3fd954d
starts changelog
martindurant Feb 4, 2024
28edfd1
revert changelog leakage
martindurant Feb 4, 2024
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
28 changes: 21 additions & 7 deletions fsspec/tests/abstract/copy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ def test_copy_directory_to_existing_directory(

# Without recursive does nothing
fs.cp(s, t)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

# With recursive
fs.cp(s, t, recursive=True)
Expand All @@ -155,7 +157,9 @@ def test_copy_directory_to_existing_directory(
assert fs.isfile(fs_join(target, "subdir", "nesteddir", "nestedfile"))

fs.rm(fs_join(target, "subdir"), recursive=True)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

# Limit recursive by maxdepth
fs.cp(s, t, recursive=True, maxdepth=1)
Expand All @@ -179,7 +183,9 @@ def test_copy_directory_to_existing_directory(
assert not fs.exists(fs_join(target, "subdir", "nesteddir"))

fs.rm(fs_join(target, "subdir"), recursive=True)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

def test_copy_directory_to_new_directory(
self,
Expand Down Expand Up @@ -271,7 +277,9 @@ def test_copy_glob_to_existing_directory(
],
recursive=True,
)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

# With recursive
for glob, recursive in zip(["*", "**"], [True, False]):
Expand All @@ -290,7 +298,9 @@ def test_copy_glob_to_existing_directory(
],
recursive=True,
)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

# Limit recursive by maxdepth
fs.cp(
Expand All @@ -308,7 +318,9 @@ def test_copy_glob_to_existing_directory(
],
recursive=True,
)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

def test_copy_glob_to_new_directory(
self, fs, fs_join, fs_bulk_operations_scenario_0, fs_target
Expand Down Expand Up @@ -451,7 +463,9 @@ def test_copy_list_of_files_to_existing_directory(
],
recursive=True,
)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

def test_copy_list_of_files_to_new_directory(
self, fs, fs_join, fs_bulk_operations_scenario_0, fs_target
Expand Down
28 changes: 21 additions & 7 deletions fsspec/tests/abstract/put.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ def test_put_directory_to_existing_directory(

# Without recursive does nothing
fs.put(s, t)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

# With recursive
fs.put(s, t, recursive=True)
Expand All @@ -158,7 +160,9 @@ def test_put_directory_to_existing_directory(
assert fs.isfile(fs_join(target, "subdir", "nesteddir", "nestedfile"))

fs.rm(fs_join(target, "subdir"), recursive=True)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

# Limit recursive by maxdepth
fs.put(s, t, recursive=True, maxdepth=1)
Expand All @@ -182,7 +186,9 @@ def test_put_directory_to_existing_directory(
assert not fs.exists(fs_join(target, "subdir", "nesteddir"))

fs.rm(fs_join(target, "subdir"), recursive=True)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

def test_put_directory_to_new_directory(
self,
Expand Down Expand Up @@ -275,7 +281,9 @@ def test_put_glob_to_existing_directory(
],
recursive=True,
)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

# With recursive
for glob, recursive in zip(["*", "**"], [True, False]):
Expand All @@ -294,7 +302,9 @@ def test_put_glob_to_existing_directory(
],
recursive=True,
)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

# Limit recursive by maxdepth
fs.put(
Expand All @@ -315,7 +325,9 @@ def test_put_glob_to_existing_directory(
],
recursive=True,
)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

def test_put_glob_to_new_directory(
self, fs, fs_join, fs_target, local_join, local_bulk_operations_scenario_0
Expand Down Expand Up @@ -463,7 +475,9 @@ def test_put_list_of_files_to_existing_directory(
],
recursive=True,
)
assert fs.ls(target) == ([] if supports_empty_directories else [dummy])
assert fs.ls(target, detail=False) == (
[] if supports_empty_directories else [dummy]
)

def test_put_list_of_files_to_new_directory(
self, fs, fs_join, fs_target, local_join, local_bulk_operations_scenario_0
Expand Down