From 4ee814f18989a325eecda44787d7389018759656 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Wed, 22 Jul 2015 11:56:37 -0700 Subject: [PATCH 1/2] Bringing all environment variables into a single place. This is so we can give a quick overview of all environment variables used. --- gcloud/_environment_vars.py | 40 ++++++++++++++++++++++++++++ gcloud/_helpers.py | 4 +-- gcloud/datastore/client.py | 8 ++---- gcloud/datastore/connection.py | 3 +-- system_tests/__init__.py | 13 +++++++++ system_tests/clear_datastore.py | 3 ++- system_tests/datastore.py | 3 ++- system_tests/local_test_setup.sample | 2 ++ system_tests/populate_datastore.py | 3 ++- system_tests/pubsub.py | 3 ++- system_tests/run_system_test.py | 4 +++ system_tests/storage.py | 3 ++- system_tests/system_test_utils.py | 17 +++++++----- 13 files changed, 84 insertions(+), 22 deletions(-) create mode 100644 gcloud/_environment_vars.py diff --git a/gcloud/_environment_vars.py b/gcloud/_environment_vars.py new file mode 100644 index 000000000000..2ce4b0a4a5d1 --- /dev/null +++ b/gcloud/_environment_vars.py @@ -0,0 +1,40 @@ +# Copyright 2015 Google Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. + +"""Comprehensive list of environment variables used in gcloud. + +These enable many types of implicit behavior in both production +and tests. +""" + +_PROJECT_ENV_VAR_NAME = 'GCLOUD_PROJECT' +"""Environment variable defining default project.""" + +_TESTS_PROJECT_ENV_VAR_NAME = 'GCLOUD_TESTS_PROJECT_ID' +"""Environment variable defining project for tests.""" + +_DATASET_ENV_VAR_NAME = 'GCLOUD_DATASET_ID' +"""Environment variable defining default dataset ID.""" + +_GCD_DATASET_ENV_VAR_NAME = 'DATASTORE_DATASET' +"""Environment variable defining default dataset ID under GCD.""" + +_GCD_HOST_ENV_VAR_NAME = 'DATASTORE_HOST' +"""Environment variable defining host for GCD dataset server.""" + +_TESTS_DATASET_ENV_VAR_NAME = 'GCLOUD_TESTS_DATASET_ID' +"""Environment variable defining dataset ID for tests.""" + +_CREDENTIALS_ENV_VAR_NAME = 'GOOGLE_APPLICATION_CREDENTIALS' +"""Environment variable defining location of Google credentials.""" diff --git a/gcloud/_helpers.py b/gcloud/_helpers.py index a17dff44f719..74e9f988d9f6 100644 --- a/gcloud/_helpers.py +++ b/gcloud/_helpers.py @@ -26,6 +26,7 @@ class Local(object): from six.moves.http_client import HTTPConnection # pylint: disable=F0401 +from gcloud._environment_vars import _PROJECT_ENV_VAR_NAME try: from google.appengine.api import app_identity except ImportError: @@ -141,9 +142,6 @@ def _compute_engine_id(): connection.close() -_PROJECT_ENV_VAR_NAME = 'GCLOUD_PROJECT' - - def _get_production_project(): """Gets the production project if it can be inferred.""" return os.getenv(_PROJECT_ENV_VAR_NAME) diff --git a/gcloud/datastore/client.py b/gcloud/datastore/client.py index 85a45735ab25..a35ce9554af0 100644 --- a/gcloud/datastore/client.py +++ b/gcloud/datastore/client.py @@ -15,6 +15,8 @@ import os +from gcloud._environment_vars import _DATASET_ENV_VAR_NAME +from gcloud._environment_vars import _GCD_DATASET_ENV_VAR_NAME from gcloud._helpers import _LocalStack from gcloud._helpers import _app_engine_id from gcloud._helpers import _compute_engine_id @@ -31,12 +33,6 @@ _MAX_LOOPS = 128 """Maximum number of iterations to wait for deferred keys.""" -_DATASET_ENV_VAR_NAME = 'GCLOUD_DATASET_ID' -"""Environment variable defining default dataset ID.""" - -_GCD_DATASET_ENV_VAR_NAME = 'DATASTORE_DATASET' -"""Environment variable defining default dataset ID under GCD.""" - def _get_production_dataset_id(): """Gets the production application ID if it can be inferred.""" diff --git a/gcloud/datastore/connection.py b/gcloud/datastore/connection.py index 576deb50c8b1..34773c37c571 100644 --- a/gcloud/datastore/connection.py +++ b/gcloud/datastore/connection.py @@ -16,6 +16,7 @@ import os +from gcloud._environment_vars import _GCD_HOST_ENV_VAR_NAME from gcloud import connection from gcloud.exceptions import make_exception from gcloud.datastore import _datastore_v1_pb2 as datastore_pb @@ -25,8 +26,6 @@ 'https://www.googleapis.com/auth/userinfo.email') """The scopes required for authenticating as a Cloud Datastore consumer.""" -_GCD_HOST_ENV_VAR_NAME = 'DATASTORE_HOST' - class Connection(connection.Connection): """A connection to the Google Cloud Datastore via the Protobuf API. diff --git a/system_tests/__init__.py b/system_tests/__init__.py index e69de29bb2d1..61e4b7953cea 100644 --- a/system_tests/__init__.py +++ b/system_tests/__init__.py @@ -0,0 +1,13 @@ +# Copyright 2015 Google Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. diff --git a/system_tests/clear_datastore.py b/system_tests/clear_datastore.py index 61678c9c3979..0a007555b399 100644 --- a/system_tests/clear_datastore.py +++ b/system_tests/clear_datastore.py @@ -16,11 +16,12 @@ from six.moves import input +from gcloud._environment_vars import _TESTS_DATASET_ENV_VAR_NAME from gcloud import datastore from gcloud.datastore import client -client._DATASET_ENV_VAR_NAME = 'GCLOUD_TESTS_DATASET_ID' +client._DATASET_ENV_VAR_NAME = _TESTS_DATASET_ENV_VAR_NAME CLIENT = datastore.Client() diff --git a/system_tests/datastore.py b/system_tests/datastore.py index 98fca6baa1cb..471cfda88eef 100644 --- a/system_tests/datastore.py +++ b/system_tests/datastore.py @@ -16,6 +16,7 @@ import pytz import unittest2 +from gcloud._environment_vars import _TESTS_DATASET_ENV_VAR_NAME from gcloud import datastore from gcloud.datastore import client # This assumes the command is being run via tox hence the @@ -23,7 +24,7 @@ from system_tests import populate_datastore -client._DATASET_ENV_VAR_NAME = 'GCLOUD_TESTS_DATASET_ID' +client._DATASET_ENV_VAR_NAME = _TESTS_DATASET_ENV_VAR_NAME CLIENT = datastore.Client() diff --git a/system_tests/local_test_setup.sample b/system_tests/local_test_setup.sample index 870f8f00dc19..4219c962570b 100644 --- a/system_tests/local_test_setup.sample +++ b/system_tests/local_test_setup.sample @@ -1,3 +1,5 @@ export GOOGLE_APPLICATION_CREDENTIALS="app_credentials.json.sample" export GCLOUD_TESTS_PROJECT_ID="my-project" export GCLOUD_TESTS_DATASET_ID=${GCLOUD_TESTS_PROJECT_ID} +export GCLOUD_REMOTE_FOR_LINT="upstream" +export GCLOUD_BRANCH_FOR_LINT="master" diff --git a/system_tests/populate_datastore.py b/system_tests/populate_datastore.py index 0c2417b9309e..2d9115d68962 100644 --- a/system_tests/populate_datastore.py +++ b/system_tests/populate_datastore.py @@ -16,11 +16,12 @@ from six.moves import zip +from gcloud._environment_vars import _TESTS_DATASET_ENV_VAR_NAME from gcloud import datastore from gcloud.datastore import client -client._DATASET_ENV_VAR_NAME = 'GCLOUD_TESTS_DATASET_ID' +client._DATASET_ENV_VAR_NAME = _TESTS_DATASET_ENV_VAR_NAME CLIENT = datastore.Client() diff --git a/system_tests/pubsub.py b/system_tests/pubsub.py index 6b57921d31c8..927c01b174a6 100644 --- a/system_tests/pubsub.py +++ b/system_tests/pubsub.py @@ -16,11 +16,12 @@ import unittest2 +from gcloud._environment_vars import _TESTS_PROJECT_ENV_VAR_NAME from gcloud import _helpers from gcloud import pubsub -_helpers._PROJECT_ENV_VAR_NAME = 'GCLOUD_TESTS_PROJECT_ID' +_helpers._PROJECT_ENV_VAR_NAME = _TESTS_PROJECT_ENV_VAR_NAME CLIENT = pubsub.Client() diff --git a/system_tests/run_system_test.py b/system_tests/run_system_test.py index 4667023eb16f..612c35c967d5 100644 --- a/system_tests/run_system_test.py +++ b/system_tests/run_system_test.py @@ -45,6 +45,10 @@ def main(): system_test_utils.check_environ(require_datastore=True) elif args.package == 'storage': system_test_utils.check_environ(require_storage=True) + elif args.package == 'pubsub': + system_test_utils.check_environ(require_pubsub=True) + else: + raise ValueError('Unexpected package name.') test_result = run_module_tests(args.package) if not test_result.wasSuccessful(): sys.exit(1) diff --git a/system_tests/storage.py b/system_tests/storage.py index 76c9c06dde0c..4af2a334ef6f 100644 --- a/system_tests/storage.py +++ b/system_tests/storage.py @@ -21,6 +21,7 @@ from gcloud import exceptions from gcloud import storage +from gcloud._environment_vars import _TESTS_PROJECT_ENV_VAR_NAME from gcloud import _helpers from gcloud.storage._helpers import _base64_md5hash @@ -28,7 +29,7 @@ HTTP = httplib2.Http() SHARED_BUCKETS = {} -_helpers._PROJECT_ENV_VAR_NAME = 'GCLOUD_TESTS_PROJECT_ID' +_helpers._PROJECT_ENV_VAR_NAME = _TESTS_PROJECT_ENV_VAR_NAME CLIENT = storage.Client() diff --git a/system_tests/system_test_utils.py b/system_tests/system_test_utils.py index cada1c1298a8..d19bb06d79c0 100644 --- a/system_tests/system_test_utils.py +++ b/system_tests/system_test_utils.py @@ -16,25 +16,30 @@ import os import sys +from gcloud._environment_vars import _CREDENTIALS_ENV_VAR_NAME +from gcloud._environment_vars import _TESTS_DATASET_ENV_VAR_NAME +from gcloud._environment_vars import _TESTS_PROJECT_ENV_VAR_NAME + # From shell environ. May be None. -PROJECT_ID = os.getenv('GCLOUD_TESTS_PROJECT_ID') -DATASET_ID = os.getenv('GCLOUD_TESTS_DATASET_ID') -CREDENTIALS = os.getenv('GOOGLE_APPLICATION_CREDENTIALS') +PROJECT_ID = os.getenv(_TESTS_PROJECT_ENV_VAR_NAME) +DATASET_ID = os.getenv(_TESTS_DATASET_ENV_VAR_NAME) +CREDENTIALS = os.getenv(_CREDENTIALS_ENV_VAR_NAME) ENVIRON_ERROR_MSG = """\ To run the system tests, you need to set some environment variables. -Please check the Contributing guide for instructions. +Please check the CONTRIBUTING guide for instructions. """ -def check_environ(require_datastore=False, require_storage=False): +def check_environ(require_datastore=False, require_storage=False, + require_pubsub=False): if require_datastore: if DATASET_ID is None or not os.path.isfile(CREDENTIALS): print(ENVIRON_ERROR_MSG, file=sys.stderr) sys.exit(1) - if require_storage: + if require_storage or require_pubsub: if PROJECT_ID is None or not os.path.isfile(CREDENTIALS): print(ENVIRON_ERROR_MSG, file=sys.stderr) sys.exit(1) From 43df1d43bfd37890e2dcca7ad6e7cea1bb22ca52 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Thu, 23 Jul 2015 16:03:23 -0700 Subject: [PATCH 2/2] Making environment var. module public. Also renaming all variables in the file to drop the `_ENV_VAR_NAME` post-fix and the leading underscore. --- gcloud/_helpers.py | 6 ++++-- gcloud/datastore/client.py | 8 ++++---- gcloud/datastore/connection.py | 4 ++-- gcloud/datastore/test_client.py | 8 ++++---- gcloud/datastore/test_connection.py | 8 ++++---- .../{_environment_vars.py => environment_vars.py} | 14 +++++++------- gcloud/test__helpers.py | 4 ++-- system_tests/clear_datastore.py | 4 ++-- system_tests/datastore.py | 4 ++-- system_tests/populate_datastore.py | 4 ++-- system_tests/pubsub.py | 4 ++-- system_tests/storage.py | 6 +++--- system_tests/system_test_utils.py | 12 ++++++------ 13 files changed, 44 insertions(+), 42 deletions(-) rename gcloud/{_environment_vars.py => environment_vars.py} (77%) diff --git a/gcloud/_helpers.py b/gcloud/_helpers.py index 74e9f988d9f6..1fe6bed12f99 100644 --- a/gcloud/_helpers.py +++ b/gcloud/_helpers.py @@ -26,12 +26,14 @@ class Local(object): from six.moves.http_client import HTTPConnection # pylint: disable=F0401 -from gcloud._environment_vars import _PROJECT_ENV_VAR_NAME try: from google.appengine.api import app_identity except ImportError: app_identity = None +from gcloud.environment_vars import PROJECT + + _RFC3339_MICROS = '%Y-%m-%dT%H:%M:%S.%fZ' @@ -144,7 +146,7 @@ def _compute_engine_id(): def _get_production_project(): """Gets the production project if it can be inferred.""" - return os.getenv(_PROJECT_ENV_VAR_NAME) + return os.getenv(PROJECT) def _determine_default_project(project=None): diff --git a/gcloud/datastore/client.py b/gcloud/datastore/client.py index a35ce9554af0..b4e2dbbc0b83 100644 --- a/gcloud/datastore/client.py +++ b/gcloud/datastore/client.py @@ -15,8 +15,6 @@ import os -from gcloud._environment_vars import _DATASET_ENV_VAR_NAME -from gcloud._environment_vars import _GCD_DATASET_ENV_VAR_NAME from gcloud._helpers import _LocalStack from gcloud._helpers import _app_engine_id from gcloud._helpers import _compute_engine_id @@ -28,6 +26,8 @@ from gcloud.datastore.key import Key from gcloud.datastore.query import Query from gcloud.datastore.transaction import Transaction +from gcloud.environment_vars import DATASET +from gcloud.environment_vars import GCD_DATASET _MAX_LOOPS = 128 @@ -36,12 +36,12 @@ def _get_production_dataset_id(): """Gets the production application ID if it can be inferred.""" - return os.getenv(_DATASET_ENV_VAR_NAME) + return os.getenv(DATASET) def _get_gcd_dataset_id(): """Gets the GCD application ID if it can be inferred.""" - return os.getenv(_GCD_DATASET_ENV_VAR_NAME) + return os.getenv(GCD_DATASET) def _determine_default_dataset_id(dataset_id=None): diff --git a/gcloud/datastore/connection.py b/gcloud/datastore/connection.py index 34773c37c571..e3108a017764 100644 --- a/gcloud/datastore/connection.py +++ b/gcloud/datastore/connection.py @@ -16,8 +16,8 @@ import os -from gcloud._environment_vars import _GCD_HOST_ENV_VAR_NAME from gcloud import connection +from gcloud.environment_vars import GCD_HOST from gcloud.exceptions import make_exception from gcloud.datastore import _datastore_v1_pb2 as datastore_pb @@ -55,7 +55,7 @@ def __init__(self, credentials=None, http=None, api_base_url=None): credentials = self._create_scoped_credentials(credentials, SCOPE) super(Connection, self).__init__(credentials=credentials, http=http) if api_base_url is None: - api_base_url = os.getenv(_GCD_HOST_ENV_VAR_NAME, + api_base_url = os.getenv(GCD_HOST, connection.API_BASE_URL) self.api_base_url = api_base_url diff --git a/gcloud/datastore/test_client.py b/gcloud/datastore/test_client.py index b5cce090fcba..4fed6d9e9ef2 100644 --- a/gcloud/datastore/test_client.py +++ b/gcloud/datastore/test_client.py @@ -49,10 +49,10 @@ def test_no_value(self): def test_value_set(self): import os from gcloud._testing import _Monkey - from gcloud.datastore.client import _DATASET_ENV_VAR_NAME + from gcloud.datastore.client import DATASET MOCK_DATASET_ID = object() - environ = {_DATASET_ENV_VAR_NAME: MOCK_DATASET_ID} + environ = {DATASET: MOCK_DATASET_ID} with _Monkey(os, getenv=environ.get): dataset_id = self._callFUT() self.assertEqual(dataset_id, MOCK_DATASET_ID) @@ -76,10 +76,10 @@ def test_no_value(self): def test_value_set(self): import os from gcloud._testing import _Monkey - from gcloud.datastore.client import _GCD_DATASET_ENV_VAR_NAME + from gcloud.datastore.client import GCD_DATASET MOCK_DATASET_ID = object() - environ = {_GCD_DATASET_ENV_VAR_NAME: MOCK_DATASET_ID} + environ = {GCD_DATASET: MOCK_DATASET_ID} with _Monkey(os, getenv=environ.get): dataset_id = self._callFUT() self.assertEqual(dataset_id, MOCK_DATASET_ID) diff --git a/gcloud/datastore/test_connection.py b/gcloud/datastore/test_connection.py index 9187df1d77da..04ac48ebc6a6 100644 --- a/gcloud/datastore/test_connection.py +++ b/gcloud/datastore/test_connection.py @@ -56,10 +56,10 @@ def test_custom_url_from_env(self): import os from gcloud._testing import _Monkey from gcloud.connection import API_BASE_URL - from gcloud.datastore.connection import _GCD_HOST_ENV_VAR_NAME + from gcloud.datastore.connection import GCD_HOST HOST = object() - fake_environ = {_GCD_HOST_ENV_VAR_NAME: HOST} + fake_environ = {GCD_HOST: HOST} with _Monkey(os, getenv=fake_environ.get): conn = self._makeOne() @@ -79,11 +79,11 @@ def test_custom_url_constructor_and_env(self): import os from gcloud._testing import _Monkey from gcloud.connection import API_BASE_URL - from gcloud.datastore.connection import _GCD_HOST_ENV_VAR_NAME + from gcloud.datastore.connection import GCD_HOST HOST1 = object() HOST2 = object() - fake_environ = {_GCD_HOST_ENV_VAR_NAME: HOST1} + fake_environ = {GCD_HOST: HOST1} with _Monkey(os, getenv=fake_environ.get): conn = self._makeOne(api_base_url=HOST2) diff --git a/gcloud/_environment_vars.py b/gcloud/environment_vars.py similarity index 77% rename from gcloud/_environment_vars.py rename to gcloud/environment_vars.py index 2ce4b0a4a5d1..7ee214148e07 100644 --- a/gcloud/_environment_vars.py +++ b/gcloud/environment_vars.py @@ -18,23 +18,23 @@ and tests. """ -_PROJECT_ENV_VAR_NAME = 'GCLOUD_PROJECT' +PROJECT = 'GCLOUD_PROJECT' """Environment variable defining default project.""" -_TESTS_PROJECT_ENV_VAR_NAME = 'GCLOUD_TESTS_PROJECT_ID' +TESTS_PROJECT = 'GCLOUD_TESTS_PROJECT_ID' """Environment variable defining project for tests.""" -_DATASET_ENV_VAR_NAME = 'GCLOUD_DATASET_ID' +DATASET = 'GCLOUD_DATASET_ID' """Environment variable defining default dataset ID.""" -_GCD_DATASET_ENV_VAR_NAME = 'DATASTORE_DATASET' +GCD_DATASET = 'DATASTORE_DATASET' """Environment variable defining default dataset ID under GCD.""" -_GCD_HOST_ENV_VAR_NAME = 'DATASTORE_HOST' +GCD_HOST = 'DATASTORE_HOST' """Environment variable defining host for GCD dataset server.""" -_TESTS_DATASET_ENV_VAR_NAME = 'GCLOUD_TESTS_DATASET_ID' +TESTS_DATASET = 'GCLOUD_TESTS_DATASET_ID' """Environment variable defining dataset ID for tests.""" -_CREDENTIALS_ENV_VAR_NAME = 'GOOGLE_APPLICATION_CREDENTIALS' +CREDENTIALS = 'GOOGLE_APPLICATION_CREDENTIALS' """Environment variable defining location of Google credentials.""" diff --git a/gcloud/test__helpers.py b/gcloud/test__helpers.py index efdb28f2f169..97599f79ef40 100644 --- a/gcloud/test__helpers.py +++ b/gcloud/test__helpers.py @@ -150,10 +150,10 @@ def test_no_value(self): def test_value_set(self): import os from gcloud._testing import _Monkey - from gcloud._helpers import _PROJECT_ENV_VAR_NAME + from gcloud._helpers import PROJECT MOCK_PROJECT = object() - environ = {_PROJECT_ENV_VAR_NAME: MOCK_PROJECT} + environ = {PROJECT: MOCK_PROJECT} with _Monkey(os, getenv=environ.get): project = self._callFUT() self.assertEqual(project, MOCK_PROJECT) diff --git a/system_tests/clear_datastore.py b/system_tests/clear_datastore.py index 0a007555b399..e953b2278a8f 100644 --- a/system_tests/clear_datastore.py +++ b/system_tests/clear_datastore.py @@ -16,12 +16,12 @@ from six.moves import input -from gcloud._environment_vars import _TESTS_DATASET_ENV_VAR_NAME from gcloud import datastore from gcloud.datastore import client +from gcloud.environment_vars import TESTS_DATASET -client._DATASET_ENV_VAR_NAME = _TESTS_DATASET_ENV_VAR_NAME +client.DATASET = TESTS_DATASET CLIENT = datastore.Client() diff --git a/system_tests/datastore.py b/system_tests/datastore.py index 471cfda88eef..8b362389e971 100644 --- a/system_tests/datastore.py +++ b/system_tests/datastore.py @@ -16,15 +16,15 @@ import pytz import unittest2 -from gcloud._environment_vars import _TESTS_DATASET_ENV_VAR_NAME from gcloud import datastore from gcloud.datastore import client +from gcloud.environment_vars import TESTS_DATASET # This assumes the command is being run via tox hence the # repository root is the current directory. from system_tests import populate_datastore -client._DATASET_ENV_VAR_NAME = _TESTS_DATASET_ENV_VAR_NAME +client.DATASET = TESTS_DATASET CLIENT = datastore.Client() diff --git a/system_tests/populate_datastore.py b/system_tests/populate_datastore.py index 2d9115d68962..2b0c4a596e61 100644 --- a/system_tests/populate_datastore.py +++ b/system_tests/populate_datastore.py @@ -16,12 +16,12 @@ from six.moves import zip -from gcloud._environment_vars import _TESTS_DATASET_ENV_VAR_NAME from gcloud import datastore from gcloud.datastore import client +from gcloud.environment_vars import TESTS_DATASET -client._DATASET_ENV_VAR_NAME = _TESTS_DATASET_ENV_VAR_NAME +client.DATASET = TESTS_DATASET CLIENT = datastore.Client() diff --git a/system_tests/pubsub.py b/system_tests/pubsub.py index 927c01b174a6..506d17722ca3 100644 --- a/system_tests/pubsub.py +++ b/system_tests/pubsub.py @@ -16,12 +16,12 @@ import unittest2 -from gcloud._environment_vars import _TESTS_PROJECT_ENV_VAR_NAME from gcloud import _helpers +from gcloud.environment_vars import TESTS_PROJECT from gcloud import pubsub -_helpers._PROJECT_ENV_VAR_NAME = _TESTS_PROJECT_ENV_VAR_NAME +_helpers.PROJECT = TESTS_PROJECT CLIENT = pubsub.Client() diff --git a/system_tests/storage.py b/system_tests/storage.py index 4af2a334ef6f..685412a7b83c 100644 --- a/system_tests/storage.py +++ b/system_tests/storage.py @@ -19,17 +19,17 @@ import time import unittest2 +from gcloud import _helpers +from gcloud.environment_vars import TESTS_PROJECT from gcloud import exceptions from gcloud import storage -from gcloud._environment_vars import _TESTS_PROJECT_ENV_VAR_NAME -from gcloud import _helpers from gcloud.storage._helpers import _base64_md5hash HTTP = httplib2.Http() SHARED_BUCKETS = {} -_helpers._PROJECT_ENV_VAR_NAME = _TESTS_PROJECT_ENV_VAR_NAME +_helpers.PROJECT = TESTS_PROJECT CLIENT = storage.Client() diff --git a/system_tests/system_test_utils.py b/system_tests/system_test_utils.py index d19bb06d79c0..4d497b8020d4 100644 --- a/system_tests/system_test_utils.py +++ b/system_tests/system_test_utils.py @@ -16,15 +16,15 @@ import os import sys -from gcloud._environment_vars import _CREDENTIALS_ENV_VAR_NAME -from gcloud._environment_vars import _TESTS_DATASET_ENV_VAR_NAME -from gcloud._environment_vars import _TESTS_PROJECT_ENV_VAR_NAME +from gcloud.environment_vars import CREDENTIALS +from gcloud.environment_vars import TESTS_DATASET +from gcloud.environment_vars import TESTS_PROJECT # From shell environ. May be None. -PROJECT_ID = os.getenv(_TESTS_PROJECT_ENV_VAR_NAME) -DATASET_ID = os.getenv(_TESTS_DATASET_ENV_VAR_NAME) -CREDENTIALS = os.getenv(_CREDENTIALS_ENV_VAR_NAME) +PROJECT_ID = os.getenv(TESTS_PROJECT) +DATASET_ID = os.getenv(TESTS_DATASET) +CREDENTIALS = os.getenv(CREDENTIALS) ENVIRON_ERROR_MSG = """\ To run the system tests, you need to set some environment variables.