Skip to content

Commit

Permalink
Merge pull request #1635 from dhermes/tox-add-bigtable-sys-tests
Browse files Browse the repository at this point in the history
Adding Bigtable system tests to tox environment (for Py2.7 only).
  • Loading branch information
dhermes committed Mar 18, 2016
2 parents 98edc64 + 7bd960a commit d5a2409
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
3 changes: 3 additions & 0 deletions system_tests/attempt_system_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
'pubsub',
'bigquery',
)
if sys.version_info[:2] == (2, 7):
MODULES += ('bigtable', 'bigtable-happybase')

SCRIPTS_DIR = os.path.dirname(__file__)
ROOT_DIR = os.path.abspath(os.path.join(SCRIPTS_DIR, '..'))
ENCRYPTED_KEYFILE = os.path.join(ROOT_DIR, 'system_tests', 'key.json.enc')
Expand Down
5 changes: 5 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ basepython =
python2.7
commands =
python {toxinidir}/system_tests/attempt_system_tests.py
setenv =
PYTHONPATH =
deps =
{[testenv]deps}
grpcio >= 0.13.0
passenv = GOOGLE_* GCLOUD_* TRAVIS* encrypted_*

[testenv:system-tests3]
Expand Down

0 comments on commit d5a2409

Please sign in to comment.