File tree Expand file tree Collapse file tree 8 files changed +17
-31
lines changed
Expand file tree Collapse file tree 8 files changed +17
-31
lines changed Original file line number Diff line number Diff line change 11include README.rst
22graft gcloud
33global-exclude *.pyc
4- recursive-exclude system_tests *
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 2626import subprocess
2727import sys
2828
29+ from run_system_test import run_module_tests
30+
31+
2932MODULES = (
3033 'datastore' ,
3134 'storage' ,
@@ -102,9 +105,6 @@ def prepare_to_run():
102105def main ():
103106 """Run all the system tests if necessary."""
104107 prepare_to_run ()
105-
106- sys .path .append (ROOT_DIR )
107- from system_tests .run_system_test import run_module_tests
108108 for module in MODULES :
109109 run_module_tests (module )
110110
Original file line number Diff line number Diff line change 2727from gcloud .exceptions import Conflict
2828# This assumes the command is being run via tox hence the
2929# repository root is the current directory.
30- from system_tests import clear_datastore
31- from system_tests import populate_datastore
32- from system_tests . system_test_utils import EmulatorCreds
30+ import clear_datastore
31+ import populate_datastore
32+ from system_test_utils import EmulatorCreds
3333
3434
3535class Config (object ):
Original file line number Diff line number Diff line change 2222from gcloud .environment_vars import PUBSUB_EMULATOR
2323from gcloud .environment_vars import TESTS_PROJECT
2424from gcloud import pubsub
25- from system_tests . system_test_utils import EmulatorCreds
25+ from system_test_utils import EmulatorCreds
2626
2727
2828DEFAULT_TOPIC_NAME = 'subscribe-me%d' % (1000 * time .time (),)
Original file line number Diff line number Diff line change 2828from gcloud .environment_vars import GCD_DATASET
2929from gcloud .environment_vars import GCD_HOST
3030from gcloud .environment_vars import PUBSUB_EMULATOR
31- from system_tests . run_system_test import run_module_tests
31+ from run_system_test import run_module_tests
3232
3333
3434PACKAGE_INFO = {
Original file line number Diff line number Diff line change 1818
1919# This assumes the command is being run via tox hence the
2020# repository root is the current directory.
21- from system_tests import bigquery
22- from system_tests import datastore
23- from system_tests import pubsub
24- from system_tests import storage
25- from system_tests import system_test_utils
21+ import bigquery
22+ import datastore
23+ import pubsub
24+ import storage
25+ import system_test_utils
2626
2727
2828REQUIREMENTS = {
Original file line number Diff line number Diff line change @@ -84,21 +84,21 @@ passenv = {[testenv:system-tests]passenv}
8484basepython =
8585 python2.7
8686commands =
87- python {toxinidir}/scripts /attempt_system_tests.py
87+ python {toxinidir}/system_tests /attempt_system_tests.py
8888passenv = GOOGLE_* GCLOUD_* TRAVIS* encrypted_*
8989
9090[testenv:system-tests3]
9191basepython =
9292 python3.4
9393commands =
94- python {toxinidir}/scripts /attempt_system_tests.py
94+ python {toxinidir}/system_tests /attempt_system_tests.py
9595passenv = {[testenv:system-tests]passenv}
9696
9797[testenv:datastore-emulator]
9898basepython =
9999 python2.7
100100commands =
101- python {toxinidir}/scripts /run_emulator.py --package =datastore
101+ python {toxinidir}/system_tests /run_emulator.py --package =datastore
102102setenv =
103103 PYTHONPATH = {toxinidir}/_testing
104104 GCLOUD_NO_PRINT =true
@@ -110,6 +110,6 @@ deps =
110110basepython =
111111 python2.7
112112commands =
113- python {toxinidir}/scripts /run_emulator.py --package =pubsub
113+ python {toxinidir}/system_tests /run_emulator.py --package =pubsub
114114passenv = GCLOUD_*
115115deps = {[testenv:datastore-emulator]deps}
You can’t perform that action at this time.
0 commit comments