Merge pull request #171 from dhermes/system-tests-final-nail-in-coffin

Final iteration to make system tests pass.

scripts/run_system_tests.py

@@ -9,8 +9,7 @@ from oauth2client import service_account
 JSON_KEY_PATH = os.getenv('OAUTH2CLIENT_TEST_JSON_KEY_PATH')
 P12_KEY_PATH = os.getenv('OAUTH2CLIENT_TEST_P12_KEY_PATH')
 P12_KEY_EMAIL = os.getenv('OAUTH2CLIENT_TEST_P12_KEY_EMAIL')
-USER_KEY_PATH = os.getenv('OAUTH2CLIENT_TEST_USER_KEY_PATH',
-                          client._get_well_known_file())
+USER_KEY_PATH = os.getenv('OAUTH2CLIENT_TEST_USER_KEY_PATH')
 USER_KEY_EMAIL = os.getenv('OAUTH2CLIENT_TEST_USER_KEY_EMAIL')
 
 SCOPE = ('https://www.googleapis.com/auth/plus.login',

scripts/run_system_tests.sh

@@ -24,18 +24,18 @@ if [[ "${TRAVIS}" == "true" ]]; then
          [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
     echo "Running in Travis during merge, decrypting stored key file."
     # Convert encrypted JSON key file into decrypted file to be used.
-    openssl aes-256-cbc -K ${encrypted_f2d92020e83e_key} \
-        -iv ${encrypted_f2d92020e83e_iv} \
+    openssl aes-256-cbc -K ${OAUTH2CLIENT_KEY} \
+        -iv ${OAUTH2CLIENT_IV} \
         -in tests/data/key.json.enc \
         -out ${OAUTH2CLIENT_TEST_JSON_KEY_PATH} -d
     # Convert encrypted P12 key file into decrypted file to be used.
-    openssl aes-256-cbc -K ${encrypted_f2d92020e83e_key} \
-        -iv ${encrypted_f2d92020e83e_iv} \
+    openssl aes-256-cbc -K ${OAUTH2CLIENT_KEY} \
+        -iv ${OAUTH2CLIENT_IV} \
         -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 ${encrypted_f2d92020e83e_key} \
-        -iv ${encrypted_f2d92020e83e_iv} \
+    openssl aes-256-cbc -K ${OAUTH2CLIENT_KEY} \
+        -iv ${OAUTH2CLIENT_IV} \
         -in tests/data/user-key.json.enc \
         -out ${OAUTH2CLIENT_TEST_USER_KEY_PATH} -d
   else