Tests, tidy

Author: willmcgugan

Makefile

@@ -11,6 +11,11 @@ test:
 	nosetests --with-coverage --cover-erase --cover-package=fs_s3fs -a "!slow" fs_s3fs/tests
 	rm .coverage
 
+.PHONY: slowtest
+slowtest:
+	nosetests --with-coverage --cover-erase --cover-package=fs_s3fs fs_s3fs/tests
+	rm .coverage
+
 .PHONY: testall
 testall:
 	tox

fs_s3fs/_s3fs.py

@@ -375,7 +375,6 @@ def _info_from_object(self, obj, namespaces):
                 if isinstance(value, datetime):
                     value = datetime_to_epoch(value)
                 s3info[name] = value
-
         if 'urls' in namespaces:
             url = self.client.generate_presigned_url(
                 ClientMethod='get_object',
@@ -387,8 +386,6 @@ def _info_from_object(self, obj, namespaces):
             info['urls'] = {
                 'download': url
             }
-
-
         return info
 
     def getinfo(self, path, namespaces=None):
@@ -483,7 +480,8 @@ def openbin(self, path, mode="r", buffering=-1, **options):
 
         if _mode.create:
 
-            def on_close(s3file):
+            def on_close_create(s3file):
+                """Called when the S3 file closes, to upload data."""
                 try:
                     s3file.raw.seek(0)
                     with s3errors(path):
@@ -503,7 +501,7 @@ def on_close(s3file):
                 if info.is_dir:
                     raise errors.FileExpected(path)
 
-            s3file = S3File.factory(path, _mode, on_close=on_close)
+            s3file = S3File.factory(path, _mode, on_close=on_close_create)
             if _mode.appending:
                 try:
                     with s3errors(path):
@@ -522,6 +520,7 @@ def on_close(s3file):
             raise errors.FileExpected(path)
 
         def on_close(s3file):
+            """Called when the S3 file closes, to upload the data."""
             try:
                 if _mode.writing:
                     s3file.raw.seek(0, os.SEEK_SET)

fs_s3fs/tests/test_s3fs.py

@@ -32,6 +32,7 @@ def _delete_bucket_contents(self):
                 Key=obj["Key"]
             )
 
+
 @attr('slow')
 class TestS3FSSubDir(FSTestCases, unittest.TestCase):
     """Test S3FS implementation from dir_path."""