Nox system test refactor #60
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
October 27, 2016 16:37
|
Not sure why travis is failing, I may have somehow broken the secrets. Will investigate tomorrow. |
nvm, I think I did something dumb so it's maybe fixed now. :) |
dhermes
reviewed
Oct 27, 2016
| - python: 2.7 | ||
| env: TOXENV=py27-system SYSTEM_TEST=1 SKIP_APP_ENGINE_SYSTEM_TEST=1 | ||
| env: TOXENV=py27-system SYSTEM_TEST=1 SKIP_APP_ENGINE_SYSTEM_TEST=1 CLOUD_SDK_ROOT=${HOME}/.cache/cloud-sdk |
| # If set, this is where the environment setup will store the Cloud SDK. | ||
| # If unset, it will download the SDK to a temporary directory. | ||
| CLOUD_SDK_ROOT = os.environ.get('CLOUD_SDK_ROOT') | ||
| if CLOUD_SDK_ROOT: |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| # If unset, it will download the SDK to a temporary directory. | ||
| CLOUD_SDK_ROOT = os.environ.get('CLOUD_SDK_ROOT') | ||
| if CLOUD_SDK_ROOT: | ||
| CLOUD_SDK_ROOT = py.path.local(CLOUD_SDK_ROOT) |
| """Downloads and installs the Google Cloud SDK.""" | ||
|
|
||
| # If the sdk already exists, we don't need to do anything else. | ||
| if CLOUD_SDK_ROOT.join('google-cloud-sdk').exists(): |
| dest.remove() | ||
| py.path.local(application_default_credentials).copy(dest) | ||
|
|
||
| gcloud('auth', 'application-default', 'print-access-token') |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| def session_default_explicit_service_account(session): | ||
| session.virtualenv = False | ||
| session.env['GOOGLE_APPLICATION_CREDENTIALS'] = SERVICE_ACCOUNT_FILE | ||
| session.env['EXPECT_PROJECT_ID'] = '1' |
|
@dhermes I did a bit of refactoring to remove the hacky usage of |
dhermes
approved these changes
Oct 28, 2016
| @@ -38,4 +38,5 @@ deploy: | |||
| repo: GoogleCloudPlatform/google-auth-library-python | |||
| env: | |||
| global: | |||
| secure: s6GdhJklftl8w/9WoETwLtvtKL4ledPA/TuBuqCXQxSuYWaPuTdRVcvoejGkHJpp7i/7v2T/0etYl+5koyskKm5+QZZweaaL7MAyjPGp+hmIaIlWQRz6w481NOf3i9uSmoQycssT0mNmwScNIqo+igbA2y14mr/e9aBuOcxNNzNzFQp2vaRMEju6q7xZMjYdcudUWL48vq9CoNa3X2ZArpqjkApR/TfYlG7glOj43NxuVDN4z9wIyUjaMHBfPgEhjaOaRyEFgEYITRwX1qDoXqcZdTVIq4Cn0uCH+Mvrz6Y+oUJGTJqH1k7N/DhzbSN9lJnVYaQW/yuvGHiGAwbb6Tcxiq2UqqhA9MfbPpmstDECs46v9Z3BT252KvYEQY7Q1v9g2gFhHvFGWISUxs80rnnPhEYfa11JoLvj2t8cowkE4pvj4OH32Eoyvc5H07hW3F5xpuF7Jt7N09TNZkUrpmiRJEhfrVNgjsrWO77/q5h8mXGd+9vYmz++yzKu+63x8x1MpeigGCG73Dpu9Otm5eydOZfpJ39ZfZWUb7G2JahgHaGweM9dmnpJtzHQgijmHjjfAx9jgnQ8IQz9nkFmyMI8H7HouwalnrJtpSSbvMqOQ0kiZhMzdBKH5pD3tjLgSlgA0pKelBwlooY6jGlj4LrtbDAxa6cZyXiFoqWpT1w= | |||
| - secure: s6GdhJklftl8w/9WoETwLtvtKL4ledPA/TuBuqCXQxSuYWaPuTdRVcvoejGkHJpp7i/7v2T/0etYl+5koyskKm5+QZZweaaL7MAyjPGp+hmIaIlWQRz6w481NOf3i9uSmoQycssT0mNmwScNIqo+igbA2y14mr/e9aBuOcxNNzNzFQp2vaRMEju6q7xZMjYdcudUWL48vq9CoNa3X2ZArpqjkApR/TfYlG7glOj43NxuVDN4z9wIyUjaMHBfPgEhjaOaRyEFgEYITRwX1qDoXqcZdTVIq4Cn0uCH+Mvrz6Y+oUJGTJqH1k7N/DhzbSN9lJnVYaQW/yuvGHiGAwbb6Tcxiq2UqqhA9MfbPpmstDECs46v9Z3BT252KvYEQY7Q1v9g2gFhHvFGWISUxs80rnnPhEYfa11JoLvj2t8cowkE4pvj4OH32Eoyvc5H07hW3F5xpuF7Jt7N09TNZkUrpmiRJEhfrVNgjsrWO77/q5h8mXGd+9vYmz++yzKu+63x8x1MpeigGCG73Dpu9Otm5eydOZfpJ39ZfZWUb7G2JahgHaGweM9dmnpJtzHQgijmHjjfAx9jgnQ8IQz9nkFmyMI8H7HouwalnrJtpSSbvMqOQ0kiZhMzdBKH5pD3tjLgSlgA0pKelBwlooY6jGlj4LrtbDAxa6cZyXiFoqWpT1w= | |||
| # This sets the config root to the tests' config root. This prevents | ||
| # our tests from clobbering a developer's configuration when running | ||
| # these tests locally. | ||
| session.env[CLOUD_SDK_CONFIG_ENV] = str(CLOUD_SDK_ROOT) |
|
|
||
| # gcloud requires Python 2.7 and doesn't work on 3.x, so we need to tell it | ||
| # where to find 2.7 when we're running in a 3.x environment. | ||
| CLOUD_SDK_PYTHON_ENV = 'GCLOUD_PYTHON' |
| if CLOUD_SDK_ROOT.join('google-cloud-sdk').exists(): | ||
| # Note that because of this we do not attempt to update the sdk - | ||
| # if the CLOUD_SDK_ROOT is cached, it will need to be periodically cleared. | ||
| if CLOUD_SDK_INSTALL_DIR.exists(): |
| dest = CLOUD_SDK_ROOT.join('application_default_credentials.json') | ||
| if dest.exists(): | ||
| dest.remove() | ||
| py.path.local(application_default_credentials).copy(dest) |
added 2 commits
October 27, 2016 22:29
|
No idea why travis is failing on py35-system, as there doesn't seem to be any output from the failing commands. Investigating now. |
added 2 commits
October 27, 2016 23:07
|
V I C T O R Y |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.