Merge branch 'master' into external_removal_fail

Author: dimitri-yatsenko

LNX-docker-compose.yml

@@ -79,7 +79,6 @@ services:
         set -e
         wget -P /home/dja/.local/bin/ https://dl.min.io/client/mc/release/linux-amd64/mc
         chmod +x /home/dja/.local/bin/mc
-        mc alias set myminio/ http://minio:9000 datajoint datajoint
         pip install --user -r test_requirements.txt
         pip install -e .
         pip freeze | grep datajoint

README.md

@@ -134,6 +134,8 @@ GID=1000
 * Launch local terminal
 * `export` environment variables in shell
 * Add entry in `/etc/hosts` for `127.0.0.1 fakeservices.datajoint.io`
+* Install [minio client(mc)](https://min.io/download#/linux) so that you can use it in terminal
+
 
 
 ### Launch Jupyter Notebook for Interactive Use

local-docker-compose.yml

@@ -84,7 +84,6 @@ services:
         set -e
         wget -P /home/dja/.local/bin/ https://dl.min.io/client/mc/release/linux-amd64/mc
         chmod +x /home/dja/.local/bin/mc
-        mc alias set myminio/ http://minio:9000 datajoint datajoint
         pip install --user nose nose-cov coveralls flake8 ptvsd
         pip install -e .
         pip freeze | grep datajoint

tests/test_s3.py

@@ -108,6 +108,10 @@ def test_remove_object_exception():
         with open('/tmp/policy.json', 'w') as f:
             f.write(json.dumps(testpolicy))
 
+        # Add alias myminio
+        os.system(
+            'mc alias set myminio/ http://fakeservices.datajoint.io datajoint datajoint')
+
         # Add the policy and apply it to the user
         os.system('mc admin policy add myminio test /tmp/policy.json')
         os.system('mc admin policy set myminio test user=jeffjeff')
@@ -133,6 +137,7 @@ def test_remove_object_exception():
         schema.external['share'].s3.client = old_client
         schema.external['share'].delete(delete_external_files=True)
         os.remove("/tmp/policy.json")
+        os.system('mc alias remove myminio/')
 
         # Raise the error we want if the error matches the expected uuid
         if str(error_list[0][0]) == str(uuid_from_buffer(pack(test[1]))):