Fix default apollo test (#32)

* added branch

* should pull from appropriate branch

* not sure what I was thinking

* need to revert this for the sed command to work

* need to revert again

* fixed test

* added group test

* hopefully we have a travis fix here

* fixed test

* updated

* updated group test

* updated group test

* cleaned up code

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

test-data/local-apollo2-arrow.yml

@@ -0,0 +1,5 @@
+__default: local
+local:
+    url: "http://localhost:8080/apollo"
+    username: "[email protected]"
+    password: "password"

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'] == "[email protected]"
 
     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'] == "[email protected]"
+        assert creator[0]['username'] == "[email protected]"
 
     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