From b1d98806952485be86379f0f4574ee4de24568a1 Mon Sep 17 00:00:00 2001
From: Jonathan Langlois <37172224+john-jam@users.noreply.github.com>
Date: Fri, 25 Aug 2023 11:11:53 +0900
Subject: [PATCH] Better double asterisk support (#769)

---
 s3fs/core.py                        |  2 ++
 s3fs/tests/derived/s3fs_fixtures.py |  1 +
 s3fs/tests/test_s3fs.py             | 17 +++++++++++------
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/s3fs/core.py b/s3fs/core.py
index 55de549d..a2df87f3 100644
--- a/s3fs/core.py
+++ b/s3fs/core.py
@@ -969,6 +969,8 @@ async def _ls(self, path, detail=False, refresh=False, versions=False):
                     for o in files
                     if o["name"].rstrip("/") == path and o["type"] != "directory"
                 ]
+                if not files:
+                    raise FileNotFoundError(path)
             if detail:
                 return files
         return files if detail else sorted([o["name"] for o in files])
diff --git a/s3fs/tests/derived/s3fs_fixtures.py b/s3fs/tests/derived/s3fs_fixtures.py
index 24cec6b6..eae000cf 100644
--- a/s3fs/tests/derived/s3fs_fixtures.py
+++ b/s3fs/tests/derived/s3fs_fixtures.py
@@ -61,6 +61,7 @@ def fs(self, _s3_base, _get_boto3_client):
     def fs_path(self):
         return test_bucket_name
 
+    @pytest.fixture
     def supports_empty_directories(self):
         return False
 
diff --git a/s3fs/tests/test_s3fs.py b/s3fs/tests/test_s3fs.py
index 00d05d0e..0d008a49 100644
--- a/s3fs/tests/test_s3fs.py
+++ b/s3fs/tests/test_s3fs.py
@@ -281,7 +281,8 @@ def test_info(s3):
     s3.mkdir(new_parent)
     with pytest.raises(FileNotFoundError):
         s3.info(new_parent)
-    s3.ls(new_parent)
+    with pytest.raises(FileNotFoundError):
+        s3.ls(new_parent)
     with pytest.raises(FileNotFoundError):
         s3.info(new_parent)
 
@@ -2070,9 +2071,13 @@ def test_via_fsspec(s3):
     import fsspec
 
     s3.mkdir("mine")
-    with fsspec.open("mine/oi", "wb") as f:
+    with fsspec.open(
+        "s3://mine/oi", "wb", client_kwargs={"endpoint_url": endpoint_uri}
+    ) as f:
         f.write(b"hello")
-    with fsspec.open("mine/oi", "rb") as f:
+    with fsspec.open(
+        "s3://mine/oi", "rb", client_kwargs={"endpoint_url": endpoint_uri}
+    ) as f:
         assert f.read() == b"hello"
 
 
@@ -2151,11 +2156,11 @@ def test_shallow_find(s3):
     ``maxdepth=1``, the results of ``find`` should be the same as those of
     ``ls``, without returning subdirectories.  See also issue 378.
     """
-
-    assert s3.ls(test_bucket_name) == s3.find(
+    ls_output = s3.ls(test_bucket_name)
+    assert sorted(ls_output + [test_bucket_name]) == s3.find(
         test_bucket_name, maxdepth=1, withdirs=True
     )
-    assert s3.ls(test_bucket_name) == s3.glob(test_bucket_name + "/*")
+    assert ls_output == s3.glob(test_bucket_name + "/*")
 
 
 def test_multi_find(s3):