Added test and fixed s3 delete error handling.

Author: jverswijver

datajoint/s3.py

@@ -76,12 +76,13 @@ def get_size(self, name):
         except minio.error.S3Error as e:
             if e.code == 'NoSuchKey':
                 raise errors.MissingExternalFile
-            else:
                 raise e
 
     def remove_object(self, name):
         logger.debug('remove_object: {}:{}'.format(self.bucket, name))
         try:
             self.client.remove_object(self.bucket, str(name))
-        except minio.ResponseError:
-            return errors.DataJointError('Failed to delete %s from s3 storage' % name)
+        except minio.error.MinioException:
+            raise errors.DataJointError('Failed to delete %s from s3 storage' % name)
+        except ValueError:
+            raise errors.DataJointError('minIO ValueError')

tests/test_s3.py

@@ -1,10 +1,14 @@
 from . import S3_CONN_INFO
-
+import time
 from minio import Minio
+from minio.objectlockconfig import ObjectLockConfig
+from minio.commonconfig import COMPLIANCE, ENABLED, GOVERNANCE
 import urllib3
 import certifi
-from nose.tools import assert_true
+from nose.tools import assert_true, raises
 
+from .schema_external import schema, SimpleRemote
+from datajoint.errors import DataJointError
 
 class TestS3:
 
@@ -29,7 +33,7 @@ def test_connection():
             http_client=http_client)
 
         assert_true(minio_client.bucket_exists(S3_CONN_INFO['bucket']))
-
+        
     @staticmethod
     def test_connection_secure():
 
@@ -52,6 +56,31 @@ def test_connection_secure():
 
         assert_true(minio_client.bucket_exists(S3_CONN_INFO['bucket']))
     @staticmethod
-    def test_remove_object():
+    @raises(DataJointError)
+    def test_remove_object_exception():
         #https://github.com/datajoint/datajoint-python/issues/952
-        raise Exception("test")
+
+        # Initialize httpClient with relevant timeout.
+        http_client = urllib3.PoolManager(
+                                          timeout=30, cert_reqs='CERT_REQUIRED',
+                                          ca_certs=certifi.where(),
+                                          retries=urllib3.Retry(total=3, backoff_factor=0.2,
+                                                                status_forcelist=[
+                                                                                  500, 502,
+                                                                                  503, 504]))
+
+        # Initialize minioClient with an endpoint and access/secret keys.
+        minio_client = Minio(
+            S3_CONN_INFO['endpoint'],
+            access_key=S3_CONN_INFO['access_key'],
+            secret_key=S3_CONN_INFO['secret_key'],
+            secure=True,
+            http_client=http_client)
+
+
+        schema.external['share'].s3.bucket = ''
+        schema.external['share'].s3.remove_object('test')
+        
+
+        
+