Refactor the testing setup a little

Change-Id: I6466bcad2bd4b72d93aad3ba289dcfd68b30aaa8

Author: Jon Wayne Parrott

Diff for: .travis.yml

@@ -12,11 +12,7 @@ cache:
   - $HOME/.cache
 env:
   global:
-  - PATH=${PATH}:${HOME}/gcloud/google-cloud-sdk/bin
-  - GOOGLE_APPLICATION_CREDENTIALS=${TRAVIS_BUILD_DIR}/testing/resources/service-account.json
-  - GOOGLE_CLIENT_SECRETS=${TRAVIS_BUILD_DIR}/testing/resources/client-secrets.json
-  - GAE_ROOT=${HOME}/.cache/
-  - secure: f3aU0nf8ZBV2QfZ03oeqvR0f/JM69P/7IH3IGoBcRUWVIXXhQ6Esh9SmCUILPtis1ZKu11I9c+NDebZio7PFgTqfvLbKzAkrg0ucx+Bsyx6379/S1trbLeKunERSGA3GqK6+OCoR5q/9sKxNvlm/c/e9h7xZmPfP5W0qwVR/K0M=
+    secure: V8kTaIK8NYMEUVzaekLoVgJzz5/9yA/KKL8CVgOmiPEjt1o1wAXy+ojyXCgjGmB16OOcTYKtXKvOBndDg99MxUzMc9uLrHF4ub2fJZy3ZoCfPaxHNOpIOTTAhB8J/nog/JpW5NnJOBGE8fAQ/TUy8nSvOwe27n4qKO5eWqTy5kA=
 addons:
   apt:
     sources:

Diff for: TESTING.md

@@ -46,27 +46,26 @@ The script will also instruct you to follow a URL to enable APIs. You will need
 
 ### Getting a service account key
 
-From the Cloud Console, create a new Service Account and download its json key. Place this file in `testing/resources/service-account.json`.
+From the Cloud Console, create a new Service Account and download its json key. Place this file in `testing/service-account.json`.
 
-Create a new OAuth client ID. Create a file `testing/resources/client-secrets.json` and write the `client_id` and `client_secret` to the file in the [Client Secrets JSON format](https://developers.google.com/api-client-library/python/guide/aaa_client_secrets).
+Create a new OAuth client ID. Create a file `testing/client-secrets.json` and write the `client_id` and `client_secret` to the file in the [Client Secrets JSON format](https://developers.google.com/api-client-library/python/guide/aaa_client_secrets).
 
 ## Environment variables
 
-* Copy `testing/resources/test-env.tmpl.sh` to `testing/resources/test-env.sh`, and updated it with your configuration.
-* Run `source testing/resources/test-env.sh`.
-* Run `export GOOGLE_APPLICATION_CREDENTIALS=testing/resources/service-account.json`.
-* Run `export GOOGLE_CLIENT_SECRETS=testing/resources/client-secrets.json`.
+* Copy `testing/test-env.tmpl.sh` to `testing/test-env.sh`, and update it with your configuration.
+* Run `source testing/test-env.sh`.
+* Run `export GOOGLE_APPLICATION_CREDENTIALS=testing/service-account.json`.
+* Run `export GOOGLE_CLIENT_SECRETS=testing/client-secrets.json`.
 
 ### Test environments
 
 We use [nox](https://nox.readthedocs.org/en/latest/) to configure
 multiple python sessions:
 
-* ``tests`` contains tests for samples that run in a normal Python 2.7 or 3.4
-  environment. This is everything outside of the ``appengine`` directory. It's
-  parameterized to run all the tests using the 2.7 and 3.4 interpreters.
+* ``tests`` Run all the tests for every sample. It's parameterized to run all
+  the tests using the 2.7 and 3.5 interpreters.
 * ``gae`` contains tests for samples that run only in Google App Engine. This is
-  (mostly) everything in the ``appengine`` directory.
+  everything in the ``appengine`` directory.
 * ``lint`` just runs the linter.
 
 To see a list of the available sessions:
@@ -81,7 +80,7 @@ with the ``-s`` flag:
 To run one particular session or provide additional parameters to ``py.test``,
 invoke nox like this:
 
-    nox -s tests -- storage/api
+    nox -s tests -- storage/cloud-client
 
 ### Adding new tests
 When adding a new top-level directory, be sure to edit ``.coveragerc`` to

Diff for: scripts/README.md

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+ROOT=$( dirname "$DIR" )
+
+# Work from the project root.
+cd $ROOT
+
+openssl aes-256-cbc -k "$1" -in testing/secrets.tar.enc -out secrets.tar -d
+tar xvf secrets.tar
+rm secrets.tar

Diff for: scripts/decrypt-secrets.sh

@@ -14,11 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-read -s -p "Enter password for encryption: " password
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+ROOT=$( dirname "$DIR" )
+
+# Work from the project root.
+cd $ROOT
+
+read -s -p "Enter password for encryption: " PASSWORD
 echo
 
-tar cvf secrets.tar testing/resources/{service-account.json,client-secrets.json,test-env.sh}
-openssl aes-256-cbc -k "$password" -in secrets.tar -out secrets.tar.enc
+tar cvf secrets.tar testing/{service-account.json,client-secrets.json,test-env.sh}
+openssl aes-256-cbc -k "$PASSWORD" -in secrets.tar -out testing/secrets.tar.enc
 rm secrets.tar
 
-travis encrypt "secrets_password=$password" --add
+travis encrypt "SECRETS_PASSWORD=$PASSWORD" --add --override

Diff for: scripts/encrypt-secrets.sh

@@ -2,12 +2,11 @@
 
 # Decrypt secrets if not on an external PR.
 if [[ $TRAVIS_SECURE_ENV_VARS == "true" ]]; then
-    openssl aes-256-cbc -k "$secrets_password" -in secrets.tar.enc -out secrets.tar -d;
-    tar xvf secrets.tar;
+    scripts/decrypt-secrets.sh "$SECRETS_PASSWORD"
 fi
 
 if [[ $TRAVIS_SECURE_ENV_VARS == "true" ]]; then
-     source ${TRAVIS_BUILD_DIR}/testing/resources/test-env.sh;
+     source ${TRAVIS_BUILD_DIR}/testing/test-env.sh;
      nox --stop-on-first-error -s lint travis;
 else
     # only run lint on external PRs

Diff for: scripts/travis.sh

@@ -0,0 +1,3 @@
+test-env.sh
+service-account.json
+client-secrets.json