Re-organizing some test stuff.

* Bigquery and storage tests extend from common tests.CloudBaseTest. * All test resources now live in tests/resources, accessible via self.resources inside of tests. * Updated tox to allow testing a single file for dev purposes.
GoogleCloudPlatform · May 21, 2015 · bfc1353 · bfc1353
1 parent b3ea84d
commit bfc1353
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 85 deletions.
diff --git a/bigquery/test/__init__.py b/bigquery/test/__init__.py
diff --git a/bigquery/test/base_test.py b/bigquery/test/base_test.py
diff --git a/bigquery/tests/__init__.py b/bigquery/tests/__init__.py
diff --git a/bigquery/test/test_async_query.py → bigquery/tests/test_async_query.py b/bigquery/test/test_async_query.py → bigquery/tests/test_async_query.py
@@ -15,10 +15,10 @@
 import unittest
 
 from bigquery.samples.async_query import run
-from bigquery.test.base_test import BaseBigqueryTest
+from tests import CloudBaseTest
 
 
-class TestAsyncQuery(BaseBigqueryTest):
+class TestAsyncQuery(CloudBaseTest):
 
     def test_async_query(self):
         for result in run(self.constants['projectId'],

diff --git a/...test/test_export_data_to_cloud_storage.py → ...ests/test_export_data_to_cloud_storage.py b/...test/test_export_data_to_cloud_storage.py → ...ests/test_export_data_to_cloud_storage.py
@@ -17,10 +17,10 @@
 import unittest
 
 from bigquery.samples.export_data_to_cloud_storage import run
-from bigquery.test.base_test import BaseBigqueryTest
+from tests import CloudBaseTest
 
 
-class TestExportTableToGCS(BaseBigqueryTest):
+class TestExportTableToGCS(CloudBaseTest):
 
     def test_export_table(self):
         run(self.constants['cloudStorageInputURI'],

diff --git a/bigquery/test/test_load_data_from_csv.py → bigquery/tests/test_load_data_from_csv.py b/bigquery/test/test_load_data_from_csv.py → bigquery/tests/test_load_data_from_csv.py
@@ -18,16 +18,15 @@
 import unittest
 
 from bigquery.samples.load_data_from_csv import run
-from bigquery.test import RESOURCE_PATH
-from bigquery.test.base_test import BaseBigqueryTest
+from tests import CloudBaseTest
 
 
-class TestLoadDataFromCSV(BaseBigqueryTest):
+class TestLoadDataFromCSV(CloudBaseTest):
 
     def setUp(self):
         super(TestLoadDataFromCSV, self).setUp()
         with open(
-                os.path.join(RESOURCE_PATH, 'schema.json'),
+                os.path.join(self.resource_path, 'schema.json'),
                 'r') as schema_file:
             self.schema = json.load(schema_file)
 

diff --git a/bigquery/test/test_streaming.py → bigquery/tests/test_streaming.py b/bigquery/test/test_streaming.py → bigquery/tests/test_streaming.py
@@ -17,16 +17,15 @@
 import unittest
 
 from bigquery.samples.streaming import run
-from bigquery.test import RESOURCE_PATH
-from bigquery.test.base_test import BaseBigqueryTest
+from tests import CloudBaseTest
 
 
-class TestStreaming(BaseBigqueryTest):
+class TestStreaming(CloudBaseTest):
 
     def test_stream_row_to_bigquery(self):
 
         with open(
-                os.path.join(RESOURCE_PATH, 'streamrows.json'),
+                os.path.join(self.resource_path, 'streamrows.json'),
                 'r') as rows_file:
 
             rows = json.load(rows_file)

diff --git a/bigquery/test/test_sync_query.py → bigquery/tests/test_sync_query.py b/bigquery/test/test_sync_query.py → bigquery/tests/test_sync_query.py
@@ -15,10 +15,10 @@
 import unittest
 
 from bigquery.samples.sync_query import run
-from bigquery.test.base_test import BaseBigqueryTest
+from tests import CloudBaseTest
 
 
-class TestSyncQuery(BaseBigqueryTest):
+class TestSyncQuery(CloudBaseTest):
 
     def test_sync_query(self):
         for result in run(self.constants['projectId'],

diff --git a/storage/tests/test_list_objects.py b/storage/tests/test_list_objects.py
@@ -21,4 +21,4 @@ def test_main(self):
             'ignored_command_name',
             self.constants['bucketName']
         ]
-        self.assertNotRaises(main(args))
+        main(args)
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -22,12 +22,15 @@
 
 BUCKET_NAME_ENV = 'TEST_BUCKET_NAME'
 PROJECT_ID_ENV = 'TEST_PROJECT_ID'
-RESOURCE_PATH = os.path.join(os.getcwd(), 'resources')
+RESOURCE_PATH = os.path.join(
+    os.path.abspath(os.path.dirname(__file__)), 'resources')
 
 
 class CloudBaseTest(unittest.TestCase):
 
     def setUp(self):
+        self.resource_path = RESOURCE_PATH
+
         # A hack to prevent get_application_default from going GAE route.
         self._server_software_org = os.environ.get('SERVER_SOFTWARE')
         os.environ['SERVER_SOFTWARE'] = ''

diff --git a/resources/constants.json → tests/resources/constants.json b/resources/constants.json → tests/resources/constants.json
diff --git a/resources/data.csv → tests/resources/data.csv b/resources/data.csv → tests/resources/data.csv
diff --git a/resources/schema.json → tests/resources/schema.json b/resources/schema.json → tests/resources/schema.json
diff --git a/resources/streamrows.json → tests/resources/streamrows.json b/resources/streamrows.json → tests/resources/streamrows.json
diff --git a/tox.ini b/tox.ini
@@ -22,5 +22,5 @@ commands =
     cover: --cover-tests --cover-branches --cover-min-percentage=70 \
     cover: --cover-inclusive --cover-erase
     cover: coveralls
-    nosetest: nosetests --with-gae
+    nosetest: nosetests --with-gae []
     pep8: flake8 --max-complexity=10 --import-order-style=google