1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9cad38925c8d/ Changeset: 9cad38925c8d User: jmchilton Date: 2014-10-07 01:25:30+00:00 Summary: Update master API key handling in tests for d7dd1f9. Now aware of anyone actually overriding this with GALAXY_TEST_MASTER_API_KEY so not maintaining backward compatibility with respect to that environment variable. Affected #: 1 file diff -r d7dd1f92d5b8e35ed9530fc5f0494e160ff8c4da -r 9cad38925c8da6221a1ce9817d382421c6627ecd test/base/api_util.py --- a/test/base/api_util.py +++ b/test/base/api_util.py @@ -9,7 +9,11 @@ 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(): Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.