parent
efe567a8f0
commit
119b90cbc9
|
@ -19,10 +19,9 @@ set -ev
|
||||||
|
|
||||||
# If we're on Travis, we need to set up the environment.
|
# If we're on Travis, we need to set up the environment.
|
||||||
if [[ "${TRAVIS}" == "true" ]]; then
|
if [[ "${TRAVIS}" == "true" ]]; then
|
||||||
# If merging to master and not a pull request, run system test.
|
# If secure variables are available, run system test.
|
||||||
if [[ "${TRAVIS_BRANCH}" == "master" ]] && \
|
if [[ "${TRAVIS_SECURE_ENV_VARS}" ]]; then
|
||||||
[[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
|
echo "Running in Travis, decrypting stored key file."
|
||||||
echo "Running in Travis during merge, decrypting stored key file."
|
|
||||||
# Convert encrypted JSON key file into decrypted file to be used.
|
# Convert encrypted JSON key file into decrypted file to be used.
|
||||||
openssl aes-256-cbc -K ${OAUTH2CLIENT_KEY} \
|
openssl aes-256-cbc -K ${OAUTH2CLIENT_KEY} \
|
||||||
-iv ${OAUTH2CLIENT_IV} \
|
-iv ${OAUTH2CLIENT_IV} \
|
||||||
|
@ -34,8 +33,8 @@ if [[ "${TRAVIS}" == "true" ]]; then
|
||||||
-in tests/data/key.p12.enc \
|
-in tests/data/key.p12.enc \
|
||||||
-out ${OAUTH2CLIENT_TEST_P12_KEY_PATH} -d
|
-out ${OAUTH2CLIENT_TEST_P12_KEY_PATH} -d
|
||||||
# Convert encrypted User JSON key file into decrypted file to be used.
|
# Convert encrypted User JSON key file into decrypted file to be used.
|
||||||
openssl aes-256-cbc -K ${OAUTH2CLIENT_KEY} \
|
openssl aes-256-cbc -K ${encrypted_1ee98544e5ca_key} \
|
||||||
-iv ${OAUTH2CLIENT_IV} \
|
-iv ${encrypted_1ee98544e5ca_iv} \
|
||||||
-in tests/data/user-key.json.enc \
|
-in tests/data/user-key.json.enc \
|
||||||
-out ${OAUTH2CLIENT_TEST_USER_KEY_PATH} -d
|
-out ${OAUTH2CLIENT_TEST_USER_KEY_PATH} -d
|
||||||
else
|
else
|
||||||
|
|
Binary file not shown.
2
tox.ini
2
tox.ini
|
@ -71,7 +71,7 @@ deps =
|
||||||
pycrypto>=2.6
|
pycrypto>=2.6
|
||||||
cryptography>=1.0
|
cryptography>=1.0
|
||||||
pyopenssl>=0.14
|
pyopenssl>=0.14
|
||||||
passenv = GOOGLE_* OAUTH2CLIENT_* TRAVIS*
|
passenv = GOOGLE_* OAUTH2CLIENT_* TRAVIS* encrypted_*
|
||||||
|
|
||||||
[testenv:system-tests3]
|
[testenv:system-tests3]
|
||||||
basepython =
|
basepython =
|
||||||
|
|
Loading…
Reference in New Issue