Merge pull request #95 from GoogleCloudPlatform/test-reorg

Takashi Matsuo · Takashi Matsuo · commit 1bfaa4d6b028 · 2015-09-16T14:21:21.000-07:00
Re-organizing tests to be beside the samples they test.
diff --git a/appengine/bigquery/main_test.py b/appengine/bigquery/main_test.py
@@ -16,11 +16,12 @@
 import re
 
 from apiclient.http import HttpMock
-from appengine.bigquery import main
 import mock
 import tests
 import webtest
 
+from . import main
+
 
 class TestAuthSample(tests.AppEngineTestbedCase):
 
diff --git a/appengine/bigquery/tests/__init__.py b/appengine/bigquery/tests/__init__.py
diff --git a/appengine/images/main_test.py b/appengine/images/main_test.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# from the app main.py
-from appengine.images import main
 import mock
 from tests import AppEngineTestbedCase
 import webtest
 
+from . import main
+
 
 class TestHandlers(AppEngineTestbedCase):
     def setUp(self):
diff --git a/appengine/images/tests/__init__.py b/appengine/images/tests/__init__.py
diff --git a/appengine/memcache/guestbook/main_test.py b/appengine/memcache/guestbook/main_test.py
@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# from the app main.py
-from appengine.ndb.overview import main
 from tests import AppEngineTestbedCase
 import webtest
 
+from . import main
+
 
 class TestHandlers(AppEngineTestbedCase):
+
     def test_hello(self):
         app = webtest.TestApp(main.app)
         response = app.get('/')
diff --git a/appengine/memcache/guestbook/tests/__init__.py b/appengine/memcache/guestbook/tests/__init__.py
diff --git a/appengine/ndb/modeling/contact_with_group_models_test.py b/appengine/ndb/modeling/contact_with_group_models_test.py
@@ -14,10 +14,11 @@
 
 """Test classes for code snippet for modeling article."""
 
-from appengine.ndb.modeling import contact_with_group_models as models
 from google.appengine.ext import ndb
 from tests import AppEngineTestbedCase
 
+from . import contact_with_group_models as models
+
 
 class ContactTestCase(AppEngineTestbedCase):
     """A test case for the Contact model with groups."""
diff --git a/appengine/ndb/modeling/keyproperty_models_test.py b/appengine/ndb/modeling/keyproperty_models_test.py
@@ -16,9 +16,10 @@
 
 import unittest
 
-from appengine.ndb.modeling import keyproperty_models as models
 from tests import AppEngineTestbedCase
 
+from . import keyproperty_models as models
+
 
 class ContactTestCase(AppEngineTestbedCase):
     """A test case for the Contact model class with KeyProperty."""
diff --git a/appengine/ndb/modeling/naive_models_test.py b/appengine/ndb/modeling/naive_models_test.py
@@ -14,9 +14,10 @@
 
 """Test classes for code snippet for modeling article."""
 
-from appengine.ndb.modeling import naive_models as models
 from tests import AppEngineTestbedCase
 
+from . import naive_models as models
+
 
 class ContactTestCase(AppEngineTestbedCase):
     """A test case for the naive Contact model classe."""
diff --git a/appengine/ndb/modeling/parent_child_models_test.py b/appengine/ndb/modeling/parent_child_models_test.py
@@ -14,10 +14,11 @@
 
 """Test classes for code snippet for modeling article."""
 
-from appengine.ndb.modeling import parent_child_models as models
 from google.appengine.ext import ndb
 from tests import AppEngineTestbedCase
 
+from . import parent_child_models as models
+
 
 class ContactTestCase(AppEngineTestbedCase):
     """A test case for the Contact model class with KeyProperty."""
diff --git a/appengine/ndb/modeling/relation_model_models_test.py b/appengine/ndb/modeling/relation_model_models_test.py
@@ -14,10 +14,11 @@
 
 """Test classes for code snippet for modeling article."""
 
-from appengine.ndb.modeling import relation_model_models as models
 from google.appengine.ext import ndb
 from tests import AppEngineTestbedCase
 
+from . import relation_model_models as models
+
 
 class ContactTestCase(AppEngineTestbedCase):
     """A test case for the Contact model with relationship model."""
diff --git a/appengine/ndb/modeling/structured_property_models_test.py b/appengine/ndb/modeling/structured_property_models_test.py
@@ -14,9 +14,10 @@
 
 """Test classes for code snippet for modeling article."""
 
-from appengine.ndb.modeling import structured_property_models as models
 from tests import AppEngineTestbedCase
 
+from . import structured_property_models as models
+
 
 class ContactTestCase(AppEngineTestbedCase):
     """A test case for the Contact model with StructuredProperty."""
diff --git a/appengine/ndb/modeling/tests/__init__.py b/appengine/ndb/modeling/tests/__init__.py
diff --git a/appengine/ndb/overview/main_test.py b/appengine/ndb/overview/main_test.py
@@ -12,14 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# from the app main.py
-from appengine.memcache.guestbook import main
 from tests import AppEngineTestbedCase
 import webtest
 
+from . import main
 
-class TestHandlers(AppEngineTestbedCase):
 
+class TestHandlers(AppEngineTestbedCase):
     def test_hello(self):
         app = webtest.TestApp(main.app)
         response = app.get('/')
diff --git a/appengine/ndb/overview/tests/__init__.py b/appengine/ndb/overview/tests/__init__.py
diff --git a/appengine/ndb/transactions/main_test.py b/appengine/ndb/transactions/main_test.py
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# from the app main.py
-from appengine.ndb.transactions import main
 from tests import AppEngineTestbedCase
 
+from . import main
+
 
 class TestHandlers(AppEngineTestbedCase):
     def setUp(self):
diff --git a/appengine/ndb/transactions/tests/__init__.py b/appengine/ndb/transactions/tests/__init__.py
diff --git a/bigquery/samples/async_query_test.py b/bigquery/samples/async_query_test.py
@@ -13,9 +13,10 @@
 #
 import json
 
-from bigquery.samples.async_query import main
 import tests
 
+from .async_query import main
+
 
 class TestAsyncQuery(tests.CloudBaseTest):
 
diff --git a/bigquery/samples/export_data_to_cloud_storage_test.py b/bigquery/samples/export_data_to_cloud_storage_test.py
@@ -13,9 +13,10 @@
 #
 
 """Tests for export_table_to_gcs."""
-from bigquery.samples.export_data_to_cloud_storage import main
 from tests import CloudBaseTest
 
+from .export_data_to_cloud_storage import main
+
 
 class TestExportTableToGCS(CloudBaseTest):
 
diff --git a/bigquery/samples/getting_started_test.py b/bigquery/samples/getting_started_test.py
@@ -13,14 +13,15 @@
 #
 import re
 
-from bigquery.samples import getting_started
 import tests
 
+from .getting_started import main
+
 
 class TestGettingStarted(tests.CloudBaseTest):
     def test_main(self):
         with tests.capture_stdout() as mock_stdout:
-            getting_started.main(self.constants['projectId'])
+            main(self.constants['projectId'])
 
         stdout = mock_stdout.getvalue()
         self.assertRegexpMatches(stdout, re.compile(
diff --git a/bigquery/samples/list_datasets_projects_test.py b/bigquery/samples/list_datasets_projects_test.py
@@ -13,15 +13,16 @@
 #
 import re
 
-from bigquery.samples import list_datasets_projects
 import tests
 
+from .list_datasets_projects import main
+
 
 class TestListDatasetsProjects(tests.CloudBaseTest):
 
     def test_main(self):
         with tests.capture_stdout() as mock_stdout:
-            list_datasets_projects.main(self.constants['projectId'])
+            main(self.constants['projectId'])
 
         stdout = mock_stdout.getvalue()
 
diff --git a/bigquery/samples/load_data_from_csv_test.py b/bigquery/samples/load_data_from_csv_test.py
@@ -14,9 +14,10 @@
 """Tests for load_data_from_csv."""
 import os
 
-from bigquery.samples.load_data_from_csv import main
 from tests import CloudBaseTest
 
+from .load_data_from_csv import main
+
 
 class TestLoadDataFromCSV(CloudBaseTest):
     def test_load_table(self):
diff --git a/bigquery/samples/streaming_test.py b/bigquery/samples/streaming_test.py
@@ -15,9 +15,10 @@
 import json
 import os
 
-from bigquery.samples import streaming
 from tests import capture_stdout, CloudBaseTest
 
+from . import streaming
+
 
 class TestStreaming(CloudBaseTest):
 
diff --git a/bigquery/samples/sync_query_test.py b/bigquery/samples/sync_query_test.py
@@ -13,9 +13,10 @@
 #
 import json
 
-from bigquery.samples.sync_query import main
 from tests import capture_stdout, CloudBaseTest
 
+from .sync_query import main
+
 
 class TestSyncQuery(CloudBaseTest):
 
diff --git a/bigquery/tests/__init__.py b/bigquery/tests/__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
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
diff --git a/compute/autoscaler/demo/frontend_test.py b/compute/autoscaler/demo/frontend_test.py
@@ -15,7 +15,7 @@
 
 import unittest
 
-from compute.autoscaler.demo import frontend
+from . import frontend
 
 
 class FakeTime(object):
diff --git a/compute/autoscaler/demo/tests/__init__.py b/compute/autoscaler/demo/tests/__init__.py
diff --git a/monitoring/samples/auth_test.py b/monitoring/samples/auth_test.py
@@ -13,12 +13,11 @@
 
 import os
 import re
-import unittest
-
-from monitoring.samples import auth
 
 import tests
 
+from . import auth
+
 
 class TestTimeseriesList(tests.CloudBaseTest):
 
@@ -34,7 +33,3 @@ def test_main(self):
             output, re.compile(r'Timeseries.list raw response:\s*'
                                r'{\s*"kind": "[^"]+",'
                                r'\s*"oldest": *"[0-9]+', re.S))
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/monitoring/samples/tests/__init__.py b/monitoring/samples/tests/__init__.py
diff --git a/storage/api/compose_objects_test.py b/storage/api/compose_objects_test.py
@@ -13,9 +13,10 @@
 #
 import os
 
-from .compose_objects import main
 from tests import CloudBaseTest
 
+from .compose_objects import main
+
 
 class TestComposeObjects(CloudBaseTest):
     def test_main(self):
diff --git a/storage/api/list_objects_test.py b/storage/api/list_objects_test.py
@@ -11,9 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .list_objects import main
 from tests import CloudBaseTest
 
+from .list_objects import main
+
 
 class TestListObjects(CloudBaseTest):
     def test_main(self):
