Skip to content

Commit

Permalink
updated for more memory and different target
Browse files Browse the repository at this point in the history
  • Loading branch information
nathandunn committed Oct 29, 2019
1 parent 6ff2319 commit 7f1fbda
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bootstrap_apollo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
export GALAXY_SHARED_DIR=`pwd`/apollo_shared_dir
mkdir -p "$GALAXY_SHARED_DIR"

docker run --memory=4g -d -it -p 8888:8080 -v `pwd`/apollo_shared_dir/:`pwd`/apollo_shared_dir/ quay.io/gmod/apollo:2.4.1
docker run --memory=4g -d -it -p 8888:8080 -v `pwd`/apollo_shared_dir/:`pwd`/apollo_shared_dir/ quay.io/gmod/apollo:fix-2290-addOrganism-metadata

echo "[BOOTSTRAP] Waiting while Apollo starts up..."
# Wait for apollo to be online
Expand Down
8 changes: 4 additions & 4 deletions test/remote_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ def test_add_organism(self):
assert res['species'] == 'newspecies'
assert res['genus'] == 'newgenus'
# FIXME https://github.com/GMOD/Apollo/issues/2290
# meta_back = json.loads(res['metadata'])
# assert 'bla' in meta_back and meta_back['bla'] == 'bli'
meta_back = json.loads(res['metadata'])
assert 'bla' in meta_back and meta_back['bla'] == 'bli'

time.sleep(3)

Expand All @@ -70,8 +70,8 @@ def test_add_organism(self):
assert org_info['species'] == 'newspecies'
assert org_info['genus'] == 'newgenus'
# FIXME https://github.com/GMOD/Apollo/issues/2290
# meta_back = json.loads(org_info['metadata'])
# assert 'bla' in meta_back and meta_back['bla'] == 'bli'
meta_back = json.loads(org_info['metadata'])
assert 'bla' in meta_back and meta_back['bla'] == 'bli'

def setUp(self):
org_info = wa.organisms.show_organism('alt_org')
Expand Down

0 comments on commit 7f1fbda

Please sign in to comment.