diff --git a/bootstrap_apollo.sh b/bootstrap_apollo.sh index ed863891..92166e7a 100755 --- a/bootstrap_apollo.sh +++ b/bootstrap_apollo.sh @@ -9,7 +9,7 @@ do case $arg in --nodocker) SHOULD_LAUNCH_DOCKER=0 - ARROW_GLOBAL_CONFIG_PATH=`pwd`/test-data/local-arrow.yml + ARROW_GLOBAL_CONFIG_PATH=`pwd`/test-data/local-apollo2-arrow.yml APOLLO_DATA_DIRECTORY=$GALAXY_SHARED_DIR mkdir -p $APOLLO_DATA_DIRECTORY shift diff --git a/test-data/local-apollo2-arrow.yml b/test-data/local-apollo2-arrow.yml new file mode 100644 index 00000000..beb80e61 --- /dev/null +++ b/test-data/local-apollo2-arrow.yml @@ -0,0 +1,5 @@ +__default: local +local: + url: "http://localhost:8080/apollo" + username: "admin@local.host" + password: "password" diff --git a/test-data/local-arrow.yml b/test-data/local-apollo3-arrow.yml similarity index 100% rename from test-data/local-arrow.yml rename to test-data/local-apollo3-arrow.yml diff --git a/test/group_test.py b/test/group_test.py index 1efa4e00..a0535631 100644 --- a/test/group_test.py +++ b/test/group_test.py @@ -51,24 +51,18 @@ def test_get_group_by_name(self): def test_get_group_creator(self): creator = wa.groups.get_group_creator('temp_group') - - user_info = wa.users.show_user(creator) - + user_info = wa.users.show_user(creator['creator']) assert user_info['username'] == "admin@local.host" def test_get_group_admin(self): creator = wa.groups.get_group_admin('temp_group') - - user_info = wa.users.show_user(creator) - - assert user_info['username'] == "admin@local.host" + assert creator[0]['username'] == "admin@local.host" def test_create_group(self): res = wa.groups.create_group("trash_group") self.waitGroupCreated('trash_group') - res = wa.groups.get_groups('trash_group') assert len(res) == 1