Re-purposing run_system_test.py to be more flexible.

dhermes · dhermes · commit 102dd0fa7b5d · 2016-01-07T15:05:17.000-08:00
Also using the re-purposed `run_module_tests` to get a basic
`scripts/attempt_system_tests.py` to perform all four tests
as is done in `scripts/run_system_tests.sh`.
diff --git a/scripts/attempt_system_tests.py b/scripts/attempt_system_tests.py
@@ -0,0 +1,46 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Attempt to run system tests.
+
+If the system tests are being run on Travis, no test need be run if
+the build is for a PR and not a merged commit.
+
+If being run as part of a Travis build for a merged commit, the
+encrypted `key.json` file need be decrypted before running tests.
+"""
+
+
+from system_tests.run_system_test import run_module_tests
+
+
+MODULES = (
+    'datastore',
+    'storage',
+    'pubsub',
+    'bigquery',
+)
+
+
+def main():
+    """Run all the system tests.
+
+    Uses module objects to directly load test cases.
+    """
+    for module in MODULES:
+        run_module_tests(module)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/system_tests/run_system_test.py b/system_tests/run_system_test.py
@@ -18,14 +18,25 @@
 
 # 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
 
+
 REQUIREMENTS = {
     'datastore': ['dataset_id', 'credentials'],
     'storage': ['project', 'credentials'],
     'pubsub': ['project', 'credentials'],
     'bigquery': ['project', 'credentials'],
 }
+TEST_MODULES = {
+    'datastore': datastore,
+    'storage': storage,
+    'pubsub': pubsub,
+    'bigquery': bigquery,
+}
 
 
 def get_parser():
@@ -38,22 +49,26 @@ def get_parser():
 
 
 def run_module_tests(module_name):
+    # Make sure environ is set before running test.
+    requirements = REQUIREMENTS[module_name]
+    system_test_utils.check_environ(*requirements)
+
     suite = unittest2.TestSuite()
-    tests = unittest2.defaultTestLoader.loadTestsFromName(module_name)
+    test_mod = TEST_MODULES[module_name]
+    tests = unittest2.defaultTestLoader.loadTestsFromModule(test_mod)
     suite.addTest(tests)
-    return unittest2.TextTestRunner(verbosity=2).run(suite)
+
+    # Run tests.
+    test_result = unittest2.TextTestRunner(verbosity=2).run(suite)
+    # Exit if not successful.
+    if not test_result.wasSuccessful():
+        sys.exit(1)
 
 
 def main():
     parser = get_parser()
     args = parser.parse_args()
-    # Make sure environ is set before running test.
-    requirements = REQUIREMENTS[args.package]
-    system_test_utils.check_environ(*requirements)
-
-    test_result = run_module_tests(args.package)
-    if not test_result.wasSuccessful():
-        sys.exit(1)
+    run_module_tests(args.package)
 
 
 if __name__ == '__main__':
