utility method for S3FS: get_total_size

fs/s3fs.py

@@ -65,7 +65,7 @@ class S3FS(FS):
         # Normalise prefix to this form: path/to/files/
         while prefix.startswith(separator):
             prefix = prefix[1:]
-        if not prefix.endswith(separator):
+        if not prefix.endswith(separator) and prefix != "":
             prefix = prefix + separator
         self._prefix = prefix
         FS.__init__(self, thread_syncronize=thread_syncronize)
@@ -449,3 +449,7 @@ class S3FS(FS):
         self.copy(src,dst,overwrite=overwrite)
         self._s3bukt.delete_key(self._s3path(src))
 
+    def get_total_size(self):
+        """Get total size of all files in this FS."""
+        return sum(k.size for k in self._s3bukt.list(prefix=self._prefix))
+

fs/tests.py

@@ -711,7 +711,7 @@ class TestAppendZipFS(TestWriteZipFS):
 import s3fs
 class TestS3FS(TestOSFS):
 
-    bucket = "test-s3fs-new.rfk.id.au"
+    bucket = "test-s3fs.rfk.id.au"
 
     def setUp(self):
         self.fs = s3fs.S3FS(self.bucket,"/unittest/files")
@@ -728,7 +728,7 @@ class TestS3FS(TestOSFS):
         self._clear()
         for k in self.fs._s3bukt.list():
             self.fs._s3bukt.delete_key(k)
-        #self.fs._s3conn.delete_bucket(self.bucket)
+        self.fs._s3conn.delete_bucket(self.bucket)
 
     def check(self, p):
         return self.fs.exists(p)