Moving all system test scripts in system_tests/.

MANIFEST.in

@@ -1,4 +1,3 @@
 include README.rst
 graft gcloud
 global-exclude *.pyc
-recursive-exclude system_tests *

setup.cfg

@@ -1,5 +1,5 @@
 [nosetests]
-ignore-files = run_system_test\.py
+exclude-dir = system_tests
 
 [bdist_wheel]
 universal = 1

scripts/attempt_system_tests.py → system_tests/attempt_system_tests.py

@@ -26,6 +26,9 @@
 import subprocess
 import sys
 
+from run_system_test import run_module_tests
+
+
 MODULES = (
     'datastore',
     'storage',
@@ -102,9 +105,6 @@ def prepare_to_run():
 def main():
     """Run all the system tests if necessary."""
     prepare_to_run()
-
-    sys.path.append(ROOT_DIR)
-    from system_tests.run_system_test import run_module_tests
     for module in MODULES:
         run_module_tests(module)
 

system_tests/datastore.py

@@ -27,9 +27,9 @@
 from gcloud.exceptions import Conflict
 # This assumes the command is being run via tox hence the
 # repository root is the current directory.
-from system_tests import clear_datastore
-from system_tests import populate_datastore
-from system_tests.system_test_utils import EmulatorCreds
+import clear_datastore
+import populate_datastore
+from system_test_utils import EmulatorCreds
 
 
 class Config(object):

system_tests/pubsub.py

@@ -22,7 +22,7 @@
 from gcloud.environment_vars import PUBSUB_EMULATOR
 from gcloud.environment_vars import TESTS_PROJECT
 from gcloud import pubsub
-from system_tests.system_test_utils import EmulatorCreds
+from system_test_utils import EmulatorCreds
 
 
 DEFAULT_TOPIC_NAME = 'subscribe-me%d' % (1000 * time.time(),)

scripts/run_emulator.py → system_tests/run_emulator.py

@@ -28,7 +28,7 @@
 from gcloud.environment_vars import GCD_DATASET
 from gcloud.environment_vars import GCD_HOST
 from gcloud.environment_vars import PUBSUB_EMULATOR
-from system_tests.run_system_test import run_module_tests
+from run_system_test import run_module_tests
 
 
 PACKAGE_INFO = {

system_tests/run_system_test.py

@@ -18,11 +18,11 @@
 
 # This assumes the command is being run via tox hence the
 # repository root is the current directory.
-from system_tests import bigquery
-from system_tests import datastore
-from system_tests import pubsub
-from system_tests import storage
-from system_tests import system_test_utils
+import bigquery
+import datastore
+import pubsub
+import storage
+import system_test_utils
 
 
 REQUIREMENTS = {

tox.ini

@@ -7,12 +7,13 @@ commands =
     nosetests
 deps =
     nose
+    nose-exclude
     unittest2
 setenv =
     PYTHONPATH = {toxinidir}/_testing
 covercmd =
     nosetests \
-      --ignore-files=run_system_test\.py \
+      --exclude-dir=system_tests \
       --with-coverage \
       --cover-package=gcloud \
       --cover-erase \
@@ -84,21 +85,21 @@ passenv = {[testenv:system-tests]passenv}
 basepython =
     python2.7
 commands =
-    python {toxinidir}/scripts/attempt_system_tests.py
+    python {toxinidir}/system_tests/attempt_system_tests.py
 passenv = GOOGLE_* GCLOUD_* TRAVIS* encrypted_*
 
 [testenv:system-tests3]
 basepython =
     python3.4
 commands =
-    python {toxinidir}/scripts/attempt_system_tests.py
+    python {toxinidir}/system_tests/attempt_system_tests.py
 passenv = {[testenv:system-tests]passenv}
 
 [testenv:datastore-emulator]
 basepython =
     python2.7
 commands =
-    python {toxinidir}/scripts/run_emulator.py --package=datastore
+    python {toxinidir}/system_tests/run_emulator.py --package=datastore
 setenv =
     PYTHONPATH = {toxinidir}/_testing
     GCLOUD_NO_PRINT=true
@@ -110,6 +111,6 @@ deps =
 basepython =
     python2.7
 commands =
-    python {toxinidir}/scripts/run_emulator.py --package=pubsub
+    python {toxinidir}/system_tests/run_emulator.py --package=pubsub
 passenv = GCLOUD_*
 deps = {[testenv:datastore-emulator]deps}