opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update master API key handling in tests for d7dd1f9.

Browse Source 
Now aware of anyone actually overriding this with GALAXY_TEST_MASTER_API_KEY so not maintaining backward compatibility with respect to that environment variable.
This commit is contained in:
John Chilton
2014-10-06 21:25:30 -04:00
parent f5d1f77a4f
commit d071165c0f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/base/api_util.py
+5 -1
View File
@@ -9,7 +9,11 @@ def get_master_api_key():
configured as a master API key and should be able to create additional
users and keys.
"""
return os.environ.get( "GALAXY_TEST_MASTER_API_KEY", DEFAULT_GALAXY_MASTER_API_KEY )
for key in ["GALAXY_CONFIG_MASTER_API_KEY", "GALAXY_CONFIG_OVERRIDE_MASTER_API_KEY"]:
value = os.environ.get(key, None)
if value:
return value
return DEFAULT_GALAXY_MASTER_API_KEY
def get_user_api_key():