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

Co-authored-by: Martin Durant <[email protected]>

Author: LuQQiu

fsspec/tests/abstract/copy.py

@@ -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)
@@ -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)
@@ -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,
@@ -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]):
@@ -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(
@@ -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
@@ -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

fsspec/tests/abstract/put.py

@@ -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)
@@ -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)
@@ -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,
@@ -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]):
@@ -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(
@@ -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
@@ -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