commit 5e9c35f5d0bf4f0e42e18d265c790572bfdd802d
author Allen Li <ayatane@chromium.org> Wed Jul 05 14:24:18 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Thu Jul 13 11:44:38 2017 -0700
tree e19b749b6c15d75b38bee10723c053be4242f130
parent ce8ebd68a9dfbc41cead33e9dc594a2b40f0c6d0

[autotest] Clean up main()

BUG=chromium:672348
TEST=None

Change-Id: I3338de4be49196e3d83ebbdb483d271b6c408cac
Reviewed-on: https://chromium-review.googlesource.com/560660
Commit-Ready: Allen Li <ayatane@chromium.org>
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>

site_utils/run_suite.py

diff --git a/site_utils/run_suite.py b/site_utils/run_suite.py
index d841d6e..d03a929 100755
--- a/site_utils/run_suite.py
+++ b/site_utils/run_suite.py
@@ -1560,7 +1560,7 @@
 SuiteResult = namedtuple('SuiteResult', ['return_code', 'output_dict'])
 
 
-def main_without_exception_handling(options):
+def _run_suite(options):
     """
     run_suite script without exception handling.
 
@@ -1826,20 +1826,14 @@
             created_on__gte=start_time,
             min_rpc_timeout=_MIN_RPC_TIMEOUT)
 
-def main():
-    """Entry point."""
-    utils.verify_not_root_user()
 
-    parser = make_parser()
-    options = parser.parse_args()
-    if options.do_nothing:
-        return
+def _run_task(parser, options):
+    """Perform this script's function minus setup.
 
+    Boilerplate like argument parsing, logging, output formatting happen
+    elsewhere.
+    """
     try:
-        # Silence the log when dumping outputs into json
-        if options.json_dump:
-            logging.disable(logging.CRITICAL)
-
         if not verify_options(options):
             parser.print_help()
             code = RETURN_CODES.INVALID_OPTIONS
@@ -1853,7 +1847,7 @@
                              _SEARCH_JOB_MAX_DAYS)
                 return
 
-            code, output_dict = main_without_exception_handling(options)
+            code, output_dict = _run_suite(options)
     except diagnosis_utils.BoardNotAvailableError as e:
         output_dict = {'return_message': 'Skipping testing: %s' % e.message}
         code = RETURN_CODES.BOARD_NOT_AVAILABLE
@@ -1868,6 +1862,22 @@
         }
         code = RETURN_CODES.INFRA_FAILURE
         logging.exception(output_dict['return_message'])
+    return code, output_dict
+
+
+def main():
+    """Entry point."""
+    utils.verify_not_root_user()
+
+    parser = make_parser()
+    options = parser.parse_args()
+    if options.do_nothing:
+        return
+    # Silence the log when dumping outputs into json
+    if options.json_dump:
+        logging.disable(logging.CRITICAL)
+
+    code, output_dict = _run_task(parser, options)
 
     # Dump test outputs into json.
     output_dict['return_code'] = code