From 119b90cbc91ed9d892df45413be5b551d90406e2 Mon Sep 17 00:00:00 2001
From: Jon Wayne Parrott <jonwayne@google.com>
Date: Tue, 9 May 2017 14:46:47 -0700
Subject: [PATCH] Fix system tests (#713)

Update user key to fix system tests
---
 scripts/run_system_tests.sh  |  11 +++++------
 tests/data/user-key.json.enc | Bin 240 -> 256 bytes
 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
index 03e1bc6b24cf2f538720039ace5b90cbff5b952f..5f5320721206ac833bb52030ab6466e22dc2bf51 100644
GIT binary patch
literal 256
zcmV+b0ssEc-V=?NgC)m{*oEEmZMLTfXDLcSHP?pTV|>v5)H~oS{$UMUf2?)IX{lCA
zFS<ln*Qy7%@};=fSy+Lc15JWDoZ)r~CGK#@E>A%o5`FWxu;V=X4f?pqQ%a4-habM!
z|HUJX&yrU{P5)fV8=uwk<h@w7KTd7K*9CR{MZp>g>N2=ZXWe<x$!(+(Z%Zs)oC<vt
zS<0j-nXg*x48*{W;NHlX6MNuKCq0uJ^Xwc+(F2f9IIm5{)dLzVh_S1LuO{apXt3Tv
z%deiHB6amblP{g2lScWY(!}-|BVfg|r1N~%3?`sP=}l#F%G_M00|OKUeC3Nv4#@~d
Gv5RZtkAjT=

literal 240
zcmV<M01y9#^bo1=RF9ZL)4Rq_=1SWFuf5*A=tJN<>kxsk@HCTo82}T6<oVG>F7}Sp
zW5dS^2-c_`M@h%IfW8<#(_y84SnphM7w+<oYVBAhMW%-f001A{%%qnj4c)=MWJ<JL
z<1;xxXZi=oA8AdpD|cgdOZ@<oj%GG~kD)@PafKwf$B(zIKk=6d^%xj=hV-dl311?2
zWPRPc6t*iu$OPJQV*Vw?Atvvc#fdidBFX(LQ4AaRbF=(gzL*N3DtonA1c1e*H6;~p
q8)thGMuibdYrI*YIrg_i6)*G4=pVAlKj7X^QhXu;4M-K%4FfC1$#R?k

diff --git a/tox.ini b/tox.ini
index b08178e..d725881 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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 =