Fix teardown and test condition

Author: jverswijver

datajoint/s3.py

@@ -76,13 +76,11 @@ def get_size(self, name):
         except minio.error.S3Error as e:
             if e.code == 'NoSuchKey':
                 raise errors.MissingExternalFile
-                raise e
+            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.error.MinioException:
             raise errors.DataJointError('Failed to delete %s from s3 storage' % name)
-        except ValueError:
-            raise errors.DataJointError('minIO ValueError something is wrong with the strings passed')

tests/test_s3.py

@@ -122,15 +122,16 @@ def test_remove_object_exception():
         schema.external['share'].s3.client = minio_client
 
         # This method returns a list of errors
-        error_list = schema.external['share'].delete(delete_external_files=True, errors_as_string=False)
+        error_list = schema.external['share'].delete(delete_external_files=True,
+                                                     errors_as_string=False)
 
         # Teardown
+        print(error_list[0][0])
         os.system('mc admin policy remove myminio test')
         os.system('mc admin user remove myminio jeffjeff')
-
-        # minio_admin.user_remove(access_key = 'jeffjeff')
-        # minio_admin.policy_remove('test')
         schema.external['share'].s3.client = old_client
-
-        # Raise the error we want
-        raise error_list[0][2]
+        schema.external['share'].delete(delete_external_files=True)
+        os.remove("/tmp/policy.json")
+        # Raise the error we want if the error matches the expected uuid
+        if str(error_list[0][0]) == '4c16e9e1-5b64-474e-4b56-ba22bb17faae':
+            raise error_list[0][2]