Merge pull request #185 from GoogleCloudPlatform/pytest

Moving to py.test test runner

Author: Jon Wayne Parrott

.gitignore

@@ -16,3 +16,5 @@ lib
 testing/resources/test-env.sh
 testing/resources/service-account.json
 secrets.tar
+.cache
+junit.xml

.travis.yml

@@ -19,9 +19,10 @@ before_install:
 - openssl aes-256-cbc -k "$secrets_password" -in secrets.tar.enc -out secrets.tar -d
 - tar xvf secrets.tar
 install:
-- pip install tox
+- pip install tox coverage
 - pip install -e git+https://github.com/GoogleCloudPlatform/python-repo-tools#egg=python-repo-tools
 - gcp-python-repo-tools download-appengine-sdk `dirname "${GAE_PYTHONPATH}"`
 script:
 - source ${TRAVIS_BUILD_DIR}/testing/resources/test-env.sh
 - tox
+- coverage report

appengine/__init__.py

@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import main
 from testing import AppEngineTest
 import webtest
 
-from . import main
-
 
 class TestAppIdentityHandler(AppEngineTest):
     def setUp(self):

appengine/app_identity/__init__.py

@@ -11,6 +11,7 @@
 # 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.
+
 # [START all]
 
 """

appengine/app_identity/signing/__init__.py

@@ -15,12 +15,11 @@
 import re
 
 from apiclient.http import HttpMock
+import main
 import mock
 import testing
 import webtest
 
-from . import main
-
 
 class TestAuthSample(testing.AppEngineTest):