Merge devtoolslib/apptest_runner.py into mojo_test.

mojo/devtools/common/devtoolslib/apptest_runner.py

Index: mojo/devtools/common/devtoolslib/apptest_runner.py
diff --git a/mojo/devtools/common/devtoolslib/apptest_runner.py b/mojo/devtools/common/devtoolslib/apptest_runner.py
deleted file mode 100644
index f95199405ad5f463b96a4cae91706b2070a83896..0000000000000000000000000000000000000000
--- a/mojo/devtools/common/devtoolslib/apptest_runner.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""High-level apptest runner that runs all tests specified in a list.
-
-TODO(ppi): merge this into `mojo_test` once all clients are switched to use
-`mojo_test` instead of calling run_apptests() directly.
-"""
-
-import sys
-import logging
-
-from .apptest_dart import run_dart_apptest
-from .apptest_gtest import run_gtest_apptest
-
-_logger = logging.getLogger()
-
-
-def run_apptests(shell, common_shell_args, test_list):
-  """Runs the apptests specified in |test_list| using the given |shell|.
-
-  Args:
-    shell: Shell that will run the tests, see shell.py.
-    common_shell_args: Arguments that will be passed to the shell on each run.
-        These will be appended to the shell-args specified for individual tests.
-    test_list: List of tests to be run in the format described in the
-        docstring of `mojo_test`.
-
-  Returns:
-    True iff all tests succeeded, False otherwise.
-  """
-  succeeded = True
-  for test_dict in test_list:
-    test = test_dict["test"]
-    test_name = test_dict.get("name", test)
-    test_type = test_dict.get("type", "gtest")
-    test_args = test_dict.get("test-args", [])
-    shell_args = test_dict.get("shell-args", []) + common_shell_args
-
-    _logger.info("Will start: %s" % test_name)
-    print "Running %s...." % test_name,
-    sys.stdout.flush()
-
-    if test_type == "dart":
-      apptest_result = run_dart_apptest(shell, shell_args, test, test_args)
-    elif test_type == "gtest":
-      apptest_result = run_gtest_apptest(shell, shell_args, test, test_args,
-                                         False)
-    elif test_type == "gtest_isolated":
-      apptest_result = run_gtest_apptest(shell, shell_args, test, test_args,
-                                         True)
-    else:
-      apptest_result = False
-      print "Unrecognized test type in %r" % test_dict
-
-    print "Succeeded" if apptest_result else "Failed"
-    _logger.info("Completed: %s" % test_name)
-    if not apptest_result:
-      succeeded = False
-  return succeeded