Merge pull request #185 from GoogleCloudPlatform/pytest

Moving to py.test test runner

.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/app_identity/signing/main_test.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/bigquery/main.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/bigquery/main_test.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):
 

appengine/blobstore/main_test.py

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

appengine/cloudsql/main_test.py

@@ -16,11 +16,10 @@
 import re
 from unittest.case import SkipTest
 
+import main
 import testing
 import webtest
 
-from . import main
-
 
 class TestMySQLSample(testing.AppEngineTest):
 

appengine/conftest.py

@@ -0,0 +1,9 @@
+import testing.appengine
+
+
+def pytest_configure(config):
+    testing.appengine.setup_sdk_imports()
+
+
+def pytest_runtest_call(item):
+    testing.appengine.import_appengine_config()

appengine/images/main_test.py

@@ -12,20 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import main
 import mock
 from testing import AppEngineTest
 import webtest
 
-from . import main
-
 
 class TestHandlers(AppEngineTest):
     def setUp(self):
         super(TestHandlers, self).setUp()
-
-        # Workaround for other tests clobbering our Greeting model.
-        reload(main)
-
         self.app = webtest.TestApp(main.app)
 
     def test_get(self):
@@ -40,7 +35,7 @@ def test_get(self):
         # Let's check if the response is correct.
         self.assertEqual(response.status_int, 200)
 
-    @mock.patch('appengine.images.main.images')
+    @mock.patch('main.images')
     def test_post(self, mock_images):
         mock_images.resize.return_value = 'asdf'
 
@@ -68,7 +63,7 @@ def test_img_missing(self):
         # Bogus image id, should get error
         self.app.get('/img?img_id=123', status=500)
 
-    @mock.patch('appengine.images.main.images')
+    @mock.patch('main.images')
     def test_post_and_get(self, mock_images):
         mock_images.resize.return_value = 'asdf'
 

appengine/logging/reading_logs/main_test.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 TestReadingLogs(AppEngineTest):
     def setUp(self):

appengine/logging/writing_logs/main_test.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 TestWritingLogs(AppEngineTest):
     def setUp(self):

appengine/mailgun/main_test.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, Http2Mock
 import webtest
 
-from . import main
-
 
 class TestMailgunHandlers(AppEngineTest):
     def setUp(self):

appengine/memcache/guestbook/main_test.py

@@ -12,11 +12,11 @@
 # 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 TestHandlers(AppEngineTest):
 

appengine/multitenancy/datastore_test.py

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

appengine/multitenancy/memcache_test.py

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

appengine/multitenancy/taskqueue_test.py

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

appengine/ndb/modeling/contact_with_group_models_test.py

@@ -14,11 +14,10 @@
 
 """Test classes for code snippet for modeling article."""
 
+import contact_with_group_models as models
 from google.appengine.ext import ndb
 from testing import AppEngineTest
 
-from . import contact_with_group_models as models
-
 
 class ContactTestCase(AppEngineTest):
     """A test case for the Contact model with groups."""

appengine/ndb/modeling/keyproperty_models_test.py

@@ -16,10 +16,9 @@
 
 import unittest
 
+import keyproperty_models as models
 from testing import AppEngineTest
 
-from . import keyproperty_models as models
-
 
 class ContactTestCase(AppEngineTest):
     """A test case for the Contact model class with KeyProperty."""

appengine/ndb/modeling/naive_models_test.py

@@ -14,10 +14,9 @@
 
 """Test classes for code snippet for modeling article."""
 
+import naive_models as models
 from testing import AppEngineTest
 
-from . import naive_models as models
-
 
 class ContactTestCase(AppEngineTest):
     """A test case for the naive Contact model classe."""

appengine/ndb/modeling/parent_child_models_test.py

@@ -15,10 +15,9 @@
 """Test classes for code snippet for modeling article."""
 
 from google.appengine.ext import ndb
+import parent_child_models as models
 from testing import AppEngineTest
 
-from . import parent_child_models as models
-
 
 class ContactTestCase(AppEngineTest):
     """A test case for the Contact model class with KeyProperty."""

appengine/ndb/modeling/relation_model_models_test.py

@@ -15,10 +15,9 @@
 """Test classes for code snippet for modeling article."""
 
 from google.appengine.ext import ndb
+import relation_model_models as models
 from testing import AppEngineTest
 
-from . import relation_model_models as models
-
 
 class ContactTestCase(AppEngineTest):
     """A test case for the Contact model with relationship model."""

appengine/ndb/modeling/structured_property_models_test.py

@@ -14,10 +14,9 @@
 
 """Test classes for code snippet for modeling article."""
 
+import structured_property_models as models
 from testing import AppEngineTest
 
-from . import structured_property_models as models
-
 
 class ContactTestCase(AppEngineTest):
     """A test case for the Contact model with StructuredProperty."""

appengine/ndb/overview/main_test.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 TestHandlers(AppEngineTest):
     def test_hello(self):

appengine/ndb/transactions/main_test.py

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

appengine/storage/main_test.py

@@ -13,11 +13,10 @@
 # limitations under the License.
 import re
 
+import main
 import testing
 import webtest
 
-from . import main
-
 
 class TestStorageSample(testing.AppEngineTest):
 

bigquery/api/async_query_test.py

@@ -10,13 +10,12 @@
 # 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.
-#
+
 import json
 
+from async_query import main
 import testing
 
-from .async_query import main
-
 
 class TestAsyncQuery(testing.CloudTest):
 

bigquery/api/export_data_to_cloud_storage_test.py

@@ -10,16 +10,13 @@
 # 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.
-#
 
-"""Tests for export_table_to_gcs."""
-from nose.plugins.attrib import attr
+from export_data_to_cloud_storage import main
+import pytest
 from testing import CloudTest
 
-from .export_data_to_cloud_storage import main
-
 
-@attr('slow')
+@pytest.mark.slow
 class TestExportTableToGCS(CloudTest):
     dataset_id = 'test_dataset'
     table_id = 'test_table'

bigquery/api/getting_started_test.py

@@ -10,13 +10,12 @@
 # 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.
-#
+
 import re
 
+from getting_started import main
 import testing
 
-from .getting_started import main
-
 
 class TestGettingStarted(testing.CloudTest):
     def test_main(self):

bigquery/api/list_datasets_projects_test.py

@@ -10,13 +10,12 @@
 # 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.
-#
+
 import re
 
+from list_datasets_projects import main
 import testing
 
-from .list_datasets_projects import main
-
 
 class TestListDatasetsProjects(testing.CloudTest):