tests

Author: willmcgugan

s3fs/_s3fs.py

@@ -95,6 +95,7 @@ def __init__(self,
         self._client = None
 
         self._tlocal = threading.local()
+        super(S3FS, self).__init__()
 
     def __repr__(self):
         return _make_repr(
@@ -219,6 +220,10 @@ def listdir(self, path):
                 if name:
                     _directory.append(name)
 
+        if not _directory:
+            if not self.getinfo(path).is_dir:
+                raise errors.DirectoryExpected(path)
+
         return _directory
 
     def makedir(self, path, permission=None, recreate=False):
@@ -318,4 +323,4 @@ def removedir(self, path):
         )
 
     def setinfo(self, path, info):
-        pass
+        getinfo(path)

s3fs/tests/test_s3fs.py

@@ -0,0 +1,33 @@
+from __future__ import unicode_literals
+
+import unittest
+
+from fs.test import FSTestCases
+
+from s3fs import S3FS
+
+import boto3
+
+class TestMemoryFS(FSTestCases, unittest.TestCase):
+    """Test OSFS implementation."""
+    bucket_name = 'fsexample'
+    s3 = boto3.resource('s3')
+    client = boto3.client('s3')
+
+    def make_fs(self):
+        self._delete_bucket_contents()
+        return S3FS(self.bucket_name)
+
+    def _delete_bucket_contents(self):
+        response = self.client.list_objects(
+            Bucket=self.bucket_name
+        )
+        contents = response.get("Contents", ())
+        for obj in contents:
+            self.client.delete_object(
+                Bucket=self.bucket_name,
+                Key=obj["Key"]
+            )
+
+    def destroy_fs(self, fs):
+        pass