Skip to content

Commit aa5a498

Browse files
committed
Moving all system test scripts in system_tests/.
Also removing system_tests/__init__.py so it is no longer a package and making all imports happen locally (rather than from the root of the project). Changes originally inspired by emulator script breakages in googleapis#1373.
1 parent bc718d3 commit aa5a498

File tree

8 files changed

+17
-31
lines changed

8 files changed

+17
-31
lines changed

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
include README.rst
22
graft gcloud
33
global-exclude *.pyc
4-
recursive-exclude system_tests *

system_tests/__init__.py

Lines changed: 0 additions & 13 deletions
This file was deleted.

scripts/attempt_system_tests.py renamed to system_tests/attempt_system_tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
import subprocess
2727
import sys
2828

29+
from run_system_test import run_module_tests
30+
31+
2932
MODULES = (
3033
'datastore',
3134
'storage',
@@ -102,9 +105,6 @@ def prepare_to_run():
102105
def 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

system_tests/datastore.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
from 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

3535
class Config(object):

system_tests/pubsub.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from gcloud.environment_vars import PUBSUB_EMULATOR
2323
from gcloud.environment_vars import TESTS_PROJECT
2424
from gcloud import pubsub
25-
from system_tests.system_test_utils import EmulatorCreds
25+
from system_test_utils import EmulatorCreds
2626

2727

2828
DEFAULT_TOPIC_NAME = 'subscribe-me%d' % (1000 * time.time(),)

scripts/run_emulator.py renamed to system_tests/run_emulator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from gcloud.environment_vars import GCD_DATASET
2929
from gcloud.environment_vars import GCD_HOST
3030
from 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

3434
PACKAGE_INFO = {

system_tests/run_system_test.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
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

2828
REQUIREMENTS = {

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@ passenv = {[testenv:system-tests]passenv}
8484
basepython =
8585
python2.7
8686
commands =
87-
python {toxinidir}/scripts/attempt_system_tests.py
87+
python {toxinidir}/system_tests/attempt_system_tests.py
8888
passenv = GOOGLE_* GCLOUD_* TRAVIS* encrypted_*
8989

9090
[testenv:system-tests3]
9191
basepython =
9292
python3.4
9393
commands =
94-
python {toxinidir}/scripts/attempt_system_tests.py
94+
python {toxinidir}/system_tests/attempt_system_tests.py
9595
passenv = {[testenv:system-tests]passenv}
9696

9797
[testenv:datastore-emulator]
9898
basepython =
9999
python2.7
100100
commands =
101-
python {toxinidir}/scripts/run_emulator.py --package=datastore
101+
python {toxinidir}/system_tests/run_emulator.py --package=datastore
102102
setenv =
103103
PYTHONPATH = {toxinidir}/_testing
104104
GCLOUD_NO_PRINT=true
@@ -110,6 +110,6 @@ deps =
110110
basepython =
111111
python2.7
112112
commands =
113-
python {toxinidir}/scripts/run_emulator.py --package=pubsub
113+
python {toxinidir}/system_tests/run_emulator.py --package=pubsub
114114
passenv = GCLOUD_*
115115
deps = {[testenv:datastore-emulator]deps}

0 commit comments

Comments
 (0)