From 29ad9468568c0ed2247642282aeaf5936d0bbfbc Mon Sep 17 00:00:00 2001 From: Anthony Bretaudeau Date: Thu, 31 Oct 2019 12:55:26 +0100 Subject: [PATCH] some cleanup --- bootstrap_apollo.sh | 2 -- test/remote_test.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bootstrap_apollo.sh b/bootstrap_apollo.sh index bf37c215..4a37ff52 100755 --- a/bootstrap_apollo.sh +++ b/bootstrap_apollo.sh @@ -3,14 +3,12 @@ export GALAXY_SHARED_DIR=`pwd`/apollo_shared_dir mkdir -p "$GALAXY_SHARED_DIR" -docker pull quay.io/gmod/apollo:latest docker run --memory=4g -d -it -p 8888:8080 -v `pwd`/apollo_shared_dir/:`pwd`/apollo_shared_dir/ quay.io/gmod/apollo:latest echo "[BOOTSTRAP] Waiting while Apollo starts up..." # Wait for apollo to be online for ((i=0;i<30;i++)) do - echo $i APOLLO_UP=$(arrow users get_users 2> /dev/null | head -1 | grep '^\[$' -q; echo "$?") if [[ $APOLLO_UP -eq 0 ]]; then break diff --git a/test/remote_test.py b/test/remote_test.py index 291e8c25..925d1fe8 100644 --- a/test/remote_test.py +++ b/test/remote_test.py @@ -45,7 +45,7 @@ def test_update_organism(self): org_info = wa.organisms.show_organism('temp_org') - meta = '{"bla": "bli"}' + meta = {"bla": "bli"} with tempfile.NamedTemporaryFile(suffix='.tar.gz') as archive: with tarfile.open(archive.name, mode="w:gz") as tar: @@ -66,7 +66,7 @@ def test_update_organism(self): def test_add_organism(self): - meta = '{"bla": "bli"}' + meta = {"bla": "bli"} with tempfile.NamedTemporaryFile(suffix='.tar.gz') as archive: with tarfile.open(archive.name, mode="w:gz") as tar: