commit 5a12d73f343b1f3118d1cd4a963af23da3ba5fe9
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 30 21:30:12 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 30 21:30:12 2019 +0000
tree a7c03e15866b883f5b7d6d68ed8f43fe87bb8daf
parent 773a18cf648ab75804b50f394c40e37ce2d74556
parent b663d3ee505b6a44fbc1bf02276b4b7b23964f98

Merge "Add reset WiFi before connecting to WiFi"

acts/framework/acts/bin/act.py

diff --git a/acts/framework/acts/bin/act.py b/acts/framework/acts/bin/act.py
index fd86c0c..72cb0c3 100755
--- a/acts/framework/acts/bin/act.py
+++ b/acts/framework/acts/bin/act.py
@@ -15,6 +15,7 @@
 #   limitations under the License.
 
 import argparse
+import os
 import re
 import signal
 import sys
@@ -211,12 +212,16 @@
             ti_key = keys.Config.key_test_case_iterations.value
             test_run_config.user_params[ti_key] = args.test_case_iterations
 
+        # Sets the --testpaths flag to the default test directory if left unset.
+        testpath_key = keys.Config.key_test_paths.value
+        if (testpath_key not in test_run_config.controller_configs
+                or test_run_config.controller_configs[testpath_key] is None):
+            test_run_config.controller_configs[testpath_key] = utils.abs_path(
+                utils.os.path.join(os.path.dirname(__file__),
+                                   '../../../tests/'))
+
         # TODO(markdr): Find a way to merge this with the validation done in
         # Mobly's load_test_config_file.
-        if (keys.Config.key_test_paths.value not in
-                test_run_config.controller_configs):
-            raise ActsConfigError("Required key %s missing in test config." %
-                                  keys.Config.key_test_paths.value)
         if not test_run_config.log_path:
             raise ActsConfigError("Required key %s missing in test config." %
                                   keys.Config.key_log_path.value)

acts/framework/acts/config_parser.py

diff --git a/acts/framework/acts/config_parser.py b/acts/framework/acts/config_parser.py
index 8942baa..549ebed 100755
--- a/acts/framework/acts/config_parser.py
+++ b/acts/framework/acts/config_parser.py
@@ -241,11 +241,9 @@
         test_run_config.testbed_name = testbed[
             keys.Config.key_testbed_name.value]
         test_run_config.controller_configs = testbed
-        if keys.Config.key_test_paths.value in configs:
-            test_run_config.controller_configs[
-                keys.Config.key_test_paths.value] = configs[
-                    keys.Config.key_test_paths.value]
-
+        test_run_config.controller_configs[
+            keys.Config.key_test_paths.value] = configs.get(
+                keys.Config.key_test_paths.value, None)
         test_run_config.log_path = configs.get(keys.Config.key_log_path.value,
                                                None)
         if test_run_config.log_path is not None: