Switching the test runner to py.test

This is the first step in moving to py.test. * Created `scripts/run-tests.py` that handles invoking `py.test` for all samples. * Updated `tox.ini` to use `scripts/run-tests.py` for the `{py27,py34}{-all}` environments. * Removed all unneeded `__init__.py` files. The repository is now a loose collection of independent packages instead of being one monster package. Outstanding questions/issues: * Currently pytest arguments are specified in `tox.ini`. Not sure if we want to move those into `run-tests.py` or not. * App Engine is still using `nose` because of `nosegae`. It appears I need to consider creating a `py.test` plugin for app engine. After this is merged, I can look into converting our tests from `unittest` style to `py.test` style, which is generally cleaner.
GoogleCloudPlatform · Feb 17, 2016 · db14c71 · db14c71
1 parent b9bb9f7
commit db14c71
Show file tree

Hide file tree

Showing 75 changed files with 209 additions and 167 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,5 @@ lib
 testing/resources/test-env.sh
 testing/resources/service-account.json
 secrets.tar
+.cache
+junit.xml
diff --git a/appengine/bigquery/main.py b/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]
 
 """

diff --git a/bigquery/__init__.py b/bigquery/__init__.py
diff --git a/bigquery/api/__init__.py b/bigquery/api/__init__.py
diff --git a/bigquery/api/async_query_test.py b/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):
 

diff --git a/bigquery/api/export_data_to_cloud_storage_test.py b/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'

diff --git a/bigquery/api/getting_started_test.py b/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):

diff --git a/bigquery/api/list_datasets_projects_test.py b/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):
 

diff --git a/bigquery/api/load_data_by_post_test.py b/bigquery/api/load_data_by_post_test.py
@@ -13,13 +13,12 @@
 
 import re
 
-from nose.plugins.attrib import attr
+from load_data_by_post import load_data
+import pytest
 import testing
 
-from .load_data_by_post import load_data
 
-
-@attr('slow')
+@pytest.mark.slow
 class TestLoadDataByPost(testing.CloudTest):
     dataset_id = 'ephemeral_test_dataset'
     table_id = 'load_data_by_post'

diff --git a/bigquery/api/load_data_from_csv_test.py b/bigquery/api/load_data_from_csv_test.py
@@ -11,13 +11,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from nose.plugins.attrib import attr
-from testing import CloudTest
 
-from .load_data_from_csv import main
+from load_data_from_csv import main
+import pytest
+from testing import CloudTest
 
 
-@attr('slow')
+@pytest.mark.slow
 class TestLoadDataFromCSV(CloudTest):
     dataset_id = 'test_dataset'
     table_id = 'test_import_table'

diff --git a/bigquery/api/streaming_test.py b/bigquery/api/streaming_test.py
@@ -10,14 +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.
-#
-"""Tests for export_table_to_gcs."""
+
 import json
 
+import streaming
 from testing import capture_stdout, CloudTest
 
-from . import streaming
-
 
 class TestStreaming(CloudTest):
     dataset_id = 'test_dataset'

diff --git a/bigquery/api/sync_query_test.py b/bigquery/api/sync_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 sync_query import main
 from testing import capture_stdout, CloudTest
 
-from .sync_query import main
-
 
 class TestSyncQuery(CloudTest):
 

diff --git a/blog/__init__.py b/blog/__init__.py
diff --git a/blog/introduction_to_data_models_in_cloud_datastore/__init__.py b/blog/introduction_to_data_models_in_cloud_datastore/__init__.py
diff --git a/blog/introduction_to_data_models_in_cloud_datastore/blog_test.py b/blog/introduction_to_data_models_in_cloud_datastore/blog_test.py
@@ -10,14 +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.
-#
-from nose.plugins.attrib import attr
-from testing import CloudTest
 
-from .blog import main
+from blog import main
+import pytest
+from testing import CloudTest
 
 
-@attr('slow')
+@pytest.mark.slow
 class BlogTestCase(CloudTest):
     """Simple test case that ensures the blog code doesn't throw any errors."""
 

diff --git a/blog/introduction_to_data_models_in_cloud_datastore/wiki_test.py b/blog/introduction_to_data_models_in_cloud_datastore/wiki_test.py
@@ -10,14 +10,14 @@
 # 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.
-#
-from nose.plugins.attrib import attr
-from testing import CloudTest
 
-from .wiki import main
+
+import pytest
+from testing import CloudTest
+from wiki import main
 
 
-@attr('slow')
+@pytest.mark.slow
 class WikiTestCase(CloudTest):
     """Simple test case that ensures the wiki code doesn't throw any errors."""
 

diff --git a/cloud_logging/__init__.py b/cloud_logging/__init__.py
diff --git a/cloud_logging/api/__init__.py b/cloud_logging/api/__init__.py
diff --git a/cloud_logging/api/list_logs_test.py b/cloud_logging/api/list_logs_test.py
@@ -14,10 +14,9 @@
 import re
 import unittest
 
+import list_logs
 import testing
 
-from . import list_logs
-
 
 class TestListLogs(testing.CloudTest):
 

diff --git a/compute/__init__.py b/compute/__init__.py
diff --git a/compute/api/__init__.py b/compute/api/__init__.py
diff --git a/compute/api/create_instance_test.py b/compute/api/create_instance_test.py
@@ -13,13 +13,12 @@
 
 import re
 
-from nose.plugins.attrib import attr
+from create_instance import main
+import pytest
 import testing
 
-from .create_instance import main
 
-
-@attr('slow')
+@pytest.mark.slow
 class TestComputeGettingStarted(testing.CloudTest):
 
     def test_main(self):

diff --git a/compute/autoscaler/__init__.py b/compute/autoscaler/__init__.py
diff --git a/compute/autoscaler/demo/__init__.py b/compute/autoscaler/demo/__init__.py
diff --git a/compute/autoscaler/demo/frontend.py b/compute/autoscaler/demo/frontend.py
@@ -10,7 +10,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.
-#
+
 """A simple web server which responds to HTTP GET requests by consuming CPU.
 This binary runs in a GCE VM. It serves HTTP requests on port 80. Every request
 with path '/service' consumes 1 core-second of CPU time, with the timeout of

diff --git a/compute/autoscaler/demo/frontend_test.py b/compute/autoscaler/demo/frontend_test.py
@@ -11,11 +11,10 @@
 # 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 unittest
 
-from . import frontend
+import frontend
 
 
 class FakeTime(object):

diff --git a/container_engine/django_tutorial/Dockerfile b/container_engine/django_tutorial/Dockerfile
@@ -10,7 +10,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 docker]
 
 # The Google App Engine python runtime is Debian Jessie with Python installed

diff --git a/datastore/__init__.py b/datastore/__init__.py
diff --git a/datastore/api/__init__.py b/datastore/api/__init__.py
diff --git a/datastore/api/snippets_test.py b/datastore/api/snippets_test.py
@@ -10,15 +10,14 @@
 # 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.
-#
+
 from functools import wraps
 import time
 
 from gcloud import datastore
+import snippets
 from testing import CloudTest, mark_flaky
 
-from . import snippets
-
 
 def eventually_consistent(f):
     @wraps(f)

diff --git a/datastore/api/tasks_test.py b/datastore/api/tasks_test.py
@@ -12,10 +12,9 @@
 # limitations under the License.
 
 from gcloud import datastore
+import tasks
 from testing import CloudTest, mark_flaky
 
-from . import tasks
-
 
 @mark_flaky
 class DatastoreTasksTest(CloudTest):

diff --git a/managed_vms/__init__.py b/managed_vms/__init__.py
diff --git a/managed_vms/analytics/__init__.py b/managed_vms/analytics/__init__.py
diff --git a/managed_vms/cloudsql/__init__.py b/managed_vms/cloudsql/__init__.py
diff --git a/managed_vms/cloudsql/main_test.py b/managed_vms/cloudsql/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 CloudTest
 
-from . import main
-
 
 class CloudSqlTest(CloudTest):
 

diff --git a/managed_vms/datastore/__init__.py b/managed_vms/datastore/__init__.py
diff --git a/managed_vms/datastore/main_test.py b/managed_vms/datastore/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 CloudTest
 
-from . import main
-
 
 class DatastoreTest(CloudTest):
 

diff --git a/managed_vms/disk/__init__.py b/managed_vms/disk/__init__.py
diff --git a/managed_vms/disk/main_test.py b/managed_vms/disk/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 CloudTest
 
-from . import main
-
 
 class DiskTest(CloudTest):
 

diff --git a/managed_vms/extending_runtime/__init__.py b/managed_vms/extending_runtime/__init__.py
diff --git a/managed_vms/extending_runtime/main_test.py b/managed_vms/extending_runtime/main_test.py
@@ -14,11 +14,10 @@
 
 import os
 
+import main
 from nose.plugins.skip import SkipTest
 from testing import CloudTest
 
-from . import main
-
 
 class ExtendingRuntimeTest(CloudTest):
 

diff --git a/managed_vms/hello_world/__init__.py b/managed_vms/hello_world/__init__.py
diff --git a/managed_vms/hello_world/main_test.py b/managed_vms/hello_world/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 CloudTest
 
-from . import main
-
 
 class HelloWorldTest(CloudTest):
 

diff --git a/managed_vms/hello_world_compat/__init__.py b/managed_vms/hello_world_compat/__init__.py
diff --git a/managed_vms/hello_world_compat/main_test.py b/managed_vms/hello_world_compat/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 CloudTest
 
-from . import main
-
 
 class HelloWorldTest(CloudTest):
 

diff --git a/managed_vms/mailgun/__init__.py b/managed_vms/mailgun/__init__.py
diff --git a/managed_vms/memcache/__init__.py b/managed_vms/memcache/__init__.py
diff --git a/managed_vms/memcache/main_test.py b/managed_vms/memcache/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 CloudTest
 
-from . import main
-
 
 class MemcacheTest(CloudTest):
 

diff --git a/managed_vms/pubsub/__init__.py b/managed_vms/pubsub/__init__.py
diff --git a/managed_vms/pubsub/main.py b/managed_vms/pubsub/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 app]
 import base64
 import json

diff --git a/managed_vms/pubsub/main_test.py b/managed_vms/pubsub/main_test.py
@@ -16,10 +16,9 @@
 import json
 import os
 
+import main
 from testing import CloudTest
 
-from . import main
-
 
 class PubSubTest(CloudTest):
     def setUp(self):

diff --git a/managed_vms/sendgrid/__init__.py b/managed_vms/sendgrid/__init__.py
diff --git a/managed_vms/static_files/__init__.py b/managed_vms/static_files/__init__.py
diff --git a/managed_vms/static_files/main_test.py b/managed_vms/static_files/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 CloudTest
 
-from . import main
-
 
 class StaticFilesTest(CloudTest):
 

diff --git a/managed_vms/storage/__init__.py b/managed_vms/storage/__init__.py