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 1
1
include README.rst
2
2
graft gcloud
3
3
global-exclude *.pyc
4
- recursive-exclude system_tests *
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 26
26
import subprocess
27
27
import sys
28
28
29
+ from run_system_test import run_module_tests
30
+
31
+
29
32
MODULES = (
30
33
'datastore' ,
31
34
'storage' ,
@@ -102,9 +105,6 @@ def prepare_to_run():
102
105
def main ():
103
106
"""Run all the system tests if necessary."""
104
107
prepare_to_run ()
105
-
106
- sys .path .append (ROOT_DIR )
107
- from system_tests .run_system_test import run_module_tests
108
108
for module in MODULES :
109
109
run_module_tests (module )
110
110
Original file line number Diff line number Diff line change 27
27
from gcloud .exceptions import Conflict
28
28
# This assumes the command is being run via tox hence the
29
29
# 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
33
33
34
34
35
35
class Config (object ):
Original file line number Diff line number Diff line change 22
22
from gcloud .environment_vars import PUBSUB_EMULATOR
23
23
from gcloud .environment_vars import TESTS_PROJECT
24
24
from gcloud import pubsub
25
- from system_tests . system_test_utils import EmulatorCreds
25
+ from system_test_utils import EmulatorCreds
26
26
27
27
28
28
DEFAULT_TOPIC_NAME = 'subscribe-me%d' % (1000 * time .time (),)
Original file line number Diff line number Diff line change 28
28
from gcloud .environment_vars import GCD_DATASET
29
29
from gcloud .environment_vars import GCD_HOST
30
30
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
32
32
33
33
34
34
PACKAGE_INFO = {
Original file line number Diff line number Diff line change 18
18
19
19
# This assumes the command is being run via tox hence the
20
20
# 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
26
26
27
27
28
28
REQUIREMENTS = {
Original file line number Diff line number Diff line change @@ -84,21 +84,21 @@ passenv = {[testenv:system-tests]passenv}
84
84
basepython =
85
85
python2.7
86
86
commands =
87
- python {toxinidir}/scripts /attempt_system_tests.py
87
+ python {toxinidir}/system_tests /attempt_system_tests.py
88
88
passenv = GOOGLE_* GCLOUD_* TRAVIS* encrypted_*
89
89
90
90
[testenv:system-tests3]
91
91
basepython =
92
92
python3.4
93
93
commands =
94
- python {toxinidir}/scripts /attempt_system_tests.py
94
+ python {toxinidir}/system_tests /attempt_system_tests.py
95
95
passenv = {[testenv:system-tests]passenv}
96
96
97
97
[testenv:datastore-emulator]
98
98
basepython =
99
99
python2.7
100
100
commands =
101
- python {toxinidir}/scripts /run_emulator.py --package =datastore
101
+ python {toxinidir}/system_tests /run_emulator.py --package =datastore
102
102
setenv =
103
103
PYTHONPATH = {toxinidir}/_testing
104
104
GCLOUD_NO_PRINT =true
@@ -110,6 +110,6 @@ deps =
110
110
basepython =
111
111
python2.7
112
112
commands =
113
- python {toxinidir}/scripts /run_emulator.py --package =pubsub
113
+ python {toxinidir}/system_tests /run_emulator.py --package =pubsub
114
114
passenv = GCLOUD_*
115
115
deps = {[testenv:datastore-emulator]deps}
You can’t perform that action at this time.
0 commit comments