Introduced TEST_PROJECT_ID and TEST_BUCKET_NAME envvars.

Takashi Matsuo · Takashi Matsuo · commit 2299bfa2a290 · 2015-05-15T08:57:09.000-07:00
diff --git a/README.md b/README.md
@@ -31,6 +31,8 @@ Google Cloud SDK installation path.
     $ pip install tox
     $ export PYTHONPATH=${GCLOUD}/platform/google_appengine
     $ export GOOGLE_APPLICATION_CREDENTIALS=your-service-account-json-file
+    $ export TEST_PROJECT_ID={YOUR_PROJECT_ID}
+    $ export TEST_BUCKET={YOUR_BUCKET_NAME}
     $ tox
 
 ## Licensing
diff --git a/bigquery/test/base_test.py b/bigquery/test/base_test.py
@@ -18,18 +18,32 @@
 from bigquery.test import RESOURCE_PATH
 
 
+BUCKET_NAME_ENV = 'TEST_BUCKET_NAME'
+PROJECT_ID_ENV = 'TEST_PROJECT_ID'
+
+
 class BaseBigqueryTest(unittest.TestCase):
 
     def setUp(self):
-        # A hack to prevent get_application_default to choose App Engine route.
+        # A hack to prevent get_application_default from going GAE route.
         self._server_software_org = os.environ.get('SERVER_SOFTWARE')
         os.environ['SERVER_SOFTWARE'] = ''
-
+        test_bucket_name = os.environ.get(BUCKET_NAME_ENV, '')
+        test_project_id = os.environ.get(PROJECT_ID_ENV, '')
+        if not test_project_id or not test_bucket_name:
+            raise Exception('You need to define an env var "%s" and "%s" to '
+                            'run the test.'
+                            % (PROJECT_ID_ENV, BUCKET_NAME_ENV))
         with open(
                 os.path.join(RESOURCE_PATH, 'constants.json'),
                 'r') as constants_file:
 
             self.constants = json.load(constants_file)
+        self.constants['projectId'] = test_project_id
+        self.constants['cloudStorageInputURI'] = (
+            self.constants['cloudStorageInputURI'] % test_bucket_name)
+        self.constants['cloudStorageOutputURI'] = (
+            self.constants['cloudStorageOutputURI'] % test_bucket_name)
 
     def tearDown(self):
         os.environ['SERVER_SOFTWARE'] = self._server_software_org
diff --git a/resources/constants.json b/resources/constants.json
@@ -1,9 +1,8 @@
 {
-	"projectId": "bigquery-devrel-samples",
 	"datasetId": "test_dataset",
 	"currentTableId": "test_table",
 	"newTableId": "test_table2",
-	"cloudStorageInputURI": "gs://bigquery-devrel-samples-bucket/data.csv",
-	"cloudStorageOutputURI": "gs://bigquery-devrel-samples-bucket/output.csv",
+	"cloudStorageInputURI": "gs://%s/data.csv",
+	"cloudStorageOutputURI": "gs://%s/output.csv",
 	"query": "SELECT corpus FROM publicdata:samples.shakespeare GROUP BY corpus;"
 }
diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,7 @@ skipsdist = True
 envlist = {py27}-{nosetest,pep8}, cover
 
 [testenv]
-passenv = PYTHONPATH GOOGLE_* GCLOUD_* PROJECT_ID TRAVIS*
+passenv = PYTHONPATH GOOGLE_* GCLOUD_* TEST_* TRAVIS*
 basepython = 
     cover,py27: python2.7
 deps =

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`{`
`2`		`- "projectId": "bigquery-devrel-samples",`
`3`	`2`	`"datasetId": "test_dataset",`
`4`	`3`	`"currentTableId": "test_table",`
`5`	`4`	`"newTableId": "test_table2",`
`6`		`- "cloudStorageInputURI": "gs://bigquery-devrel-samples-bucket/data.csv",`
`7`		`- "cloudStorageOutputURI": "gs://bigquery-devrel-samples-bucket/output.csv",`
	`5`	`+ "cloudStorageInputURI": "gs://%s/data.csv",`
	`6`	`+ "cloudStorageOutputURI": "gs://%s/output.csv",`
`8`	`7`	`"query": "SELECT corpus FROM publicdata:samples.shakespeare GROUP BY corpus;"`
`9`	`8`	`}`