diff options
author | Jon Wayne Parrott <jonwayne@google.com> | 2017-05-09 14:46:47 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-09 14:46:47 -0700 |
commit | 119b90cbc91ed9d892df45413be5b551d90406e2 (patch) | |
tree | 78893ebee66e3acdaa2f36f892b31f6a853f80fc | |
parent | efe567a8f03739a5a340fa9f6909690db340caf6 (diff) | |
download | oauth2client-119b90cbc91ed9d892df45413be5b551d90406e2.tar.gz |
Fix system tests (#713)
Update user key to fix system tests
-rwxr-xr-x | scripts/run_system_tests.sh | 11 | ||||
-rw-r--r-- | tests/data/user-key.json.enc | bin | 240 -> 256 bytes | |||
-rw-r--r-- | tox.ini | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/scripts/run_system_tests.sh b/scripts/run_system_tests.sh index 7169eb7..2e10e5c 100755 --- a/scripts/run_system_tests.sh +++ b/scripts/run_system_tests.sh @@ -19,10 +19,9 @@ set -ev # If we're on Travis, we need to set up the environment. if [[ "${TRAVIS}" == "true" ]]; then - # If merging to master and not a pull request, run system test. - if [[ "${TRAVIS_BRANCH}" == "master" ]] && \ - [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then - echo "Running in Travis during merge, decrypting stored key file." + # If secure variables are available, run system test. + if [[ "${TRAVIS_SECURE_ENV_VARS}" ]]; then + echo "Running in Travis, decrypting stored key file." # Convert encrypted JSON key file into decrypted file to be used. openssl aes-256-cbc -K ${OAUTH2CLIENT_KEY} \ -iv ${OAUTH2CLIENT_IV} \ @@ -34,8 +33,8 @@ if [[ "${TRAVIS}" == "true" ]]; then -in tests/data/key.p12.enc \ -out ${OAUTH2CLIENT_TEST_P12_KEY_PATH} -d # Convert encrypted User JSON key file into decrypted file to be used. - openssl aes-256-cbc -K ${OAUTH2CLIENT_KEY} \ - -iv ${OAUTH2CLIENT_IV} \ + openssl aes-256-cbc -K ${encrypted_1ee98544e5ca_key} \ + -iv ${encrypted_1ee98544e5ca_iv} \ -in tests/data/user-key.json.enc \ -out ${OAUTH2CLIENT_TEST_USER_KEY_PATH} -d else diff --git a/tests/data/user-key.json.enc b/tests/data/user-key.json.enc Binary files differindex 03e1bc6..5f53207 100644 --- a/tests/data/user-key.json.enc +++ b/tests/data/user-key.json.enc @@ -71,7 +71,7 @@ deps = pycrypto>=2.6 cryptography>=1.0 pyopenssl>=0.14 -passenv = GOOGLE_* OAUTH2CLIENT_* TRAVIS* +passenv = GOOGLE_* OAUTH2CLIENT_* TRAVIS* encrypted_* [testenv:system-tests3] basepython = |