diff options
author | Jon Wayne Parrott <jonwayne@google.com> | 2016-08-08 14:52:13 -0700 |
---|---|---|
committer | Pat Ferate <pferate+github@gmail.com> | 2016-08-09 14:41:14 -0700 |
commit | 4cac96d1a829e3e4e7b28c58c121db728a4d39c6 (patch) | |
tree | 90680217c51715ca3e8b4a20924aa10b89a58c60 /tests | |
parent | c359c401e74f26c2b73403f7a756ccb93b571f32 (diff) | |
download | oauth2client-4cac96d1a829e3e4e7b28c58c121db728a4d39c6.tar.gz |
Re-configure App engine tests
Diffstat (limited to 'tests')
-rw-r--r-- | tests/conftest.py | 33 | ||||
-rw-r--r-- | tests/contrib/appengine/__init__.py | 0 | ||||
-rw-r--r-- | tests/contrib/appengine/conftest.py | 53 | ||||
-rw-r--r-- | tests/contrib/appengine/test__appengine_ndb.py (renamed from tests/contrib/test__appengine_ndb.py) | 2 | ||||
-rw-r--r-- | tests/contrib/appengine/test_appengine.py (renamed from tests/contrib/test_appengine.py) | 4 |
5 files changed, 65 insertions, 27 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 5d53edd..caadb80 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -12,35 +12,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Common testing tools for OAuth2Client tests.""" +"""Py.test hooks.""" -import sys +from oauth2client import _helpers -from six.moves import reload_module -from oauth2client import util +def pytest_addoption(parser): + """Adds the --gae-sdk option to py.test. - -def set_up_gae_environment(gae_sdk_path): - """Set up appengine SDK third-party imports.""" - if 'google' in sys.modules: - # Some packages, such as protobuf, clobber the google - # namespace package. This prevents that. - reload_module(sys.modules['google']) - - # This sets up google-provided libraries. - sys.path.insert(0, gae_sdk_path) - import dev_appserver - dev_appserver.fix_sys_path() - - # Fixes timezone and other os-level items. - import google.appengine.tools.os_compat # noqa: unused import + This is used to enable the GAE tests. This has to be in this conftest.py + due to the way py.test collects conftest files.""" + parser.addoption('--gae-sdk') def pytest_configure(config): - """Pytest hook function for setting up test session.""" - # Set up Google SDK modules unless specified not to - if not config.option.no_gae: - set_up_gae_environment(config.option.sdk_path) + """Py.test hook called before loading tests.""" # Default of POSITIONAL_WARNING is too verbose for testing - util.positional_parameters_enforcement = util.POSITIONAL_EXCEPTION + _helpers.positional_parameters_enforcement = _helpers.POSITIONAL_EXCEPTION diff --git a/tests/contrib/appengine/__init__.py b/tests/contrib/appengine/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/contrib/appengine/__init__.py diff --git a/tests/contrib/appengine/conftest.py b/tests/contrib/appengine/conftest.py new file mode 100644 index 0000000..b56fbcd --- /dev/null +++ b/tests/contrib/appengine/conftest.py @@ -0,0 +1,53 @@ +# Copyright 2016 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. + +"""App Engine py.test configuration.""" + +import sys + +from six.moves import reload_module + + +def set_up_gae_environment(sdk_path): + """Set up appengine SDK third-party imports. + + The App Engine SDK does terrible things to the global interpreter state. + Because of this, this stuff can't be neatly undone. As such, it can't be + a fixture. + """ + if 'google' in sys.modules: + # Some packages, such as protobuf, clobber the google + # namespace package. This prevents that. + reload_module(sys.modules['google']) + + # This sets up google-provided libraries. + sys.path.insert(0, sdk_path) + import dev_appserver + dev_appserver.fix_sys_path() + + # Fixes timezone and other os-level items. + import google.appengine.tools.os_compat # noqa: unused import + + +def pytest_configure(config): + """Configures the App Engine SDK imports on py.test startup.""" + if config.getoption('gae_sdk') is not None: + set_up_gae_environment(config.getoption('gae_sdk')) + + +def pytest_ignore_collect(path, config): + """Skip App Engine tests when --gae-sdk is not specified.""" + return ( + 'contrib/appengine' in str(path) and + config.getoption('gae_sdk') is None) diff --git a/tests/contrib/test__appengine_ndb.py b/tests/contrib/appengine/test__appengine_ndb.py index 41e3805..3a111e1 100644 --- a/tests/contrib/test__appengine_ndb.py +++ b/tests/contrib/appengine/test__appengine_ndb.py @@ -24,7 +24,7 @@ from oauth2client import client from oauth2client.contrib import appengine -DATA_DIR = os.path.join(os.path.dirname(__file__), '..', 'data') +DATA_DIR = os.path.join(os.path.dirname(__file__), '..', '..', 'data') def datafile(filename): diff --git a/tests/contrib/test_appengine.py b/tests/contrib/appengine/test_appengine.py index b6d2dad..6890b64 100644 --- a/tests/contrib/test_appengine.py +++ b/tests/contrib/appengine/test_appengine.py @@ -37,11 +37,11 @@ import oauth2client from oauth2client import client from oauth2client import clientsecrets from oauth2client.contrib import appengine -from .. import http_mock +from ... import http_mock __author__ = 'jcgregorio@google.com (Joe Gregorio)' -DATA_DIR = os.path.join(os.path.dirname(__file__), '..', 'data') +DATA_DIR = os.path.join(os.path.dirname(__file__), '..', '..', 'data') DEFAULT_RESP = """\ { "access_token": "foo_access_token", |