Report apptest_runner device not found infra failures.

mojo/tools/apptest_runner.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """A test runner for gtest application tests."""
 
 import argparse
 import json
 import logging
+import os
 import sys
 import time
 
 from mopy import gtest
 from mopy.config import Config
 
 
 def main():
   parser = argparse.ArgumentParser(description="An application test runner.")
   parser.add_argument("test_list_file", type=file,
@@ skipping 11 matching lines @@
   logger.debug("Initialized logging: level=%s" % logger.level)
 
   logger.debug("Test list file: %s", args.test_list_file)
   config = Config(args.build_dir)
   execution_globals = {"config": config}
   exec args.test_list_file in execution_globals
   test_list = execution_globals["tests"]
   logger.debug("Test list: %s" % test_list)
 
   shell = None
-  extra_args = []
   if config.target_os == Config.OS_ANDROID:
     from mopy.android import AndroidShell
     shell = AndroidShell(config)
-    extra_args.extend(shell.PrepareShellRun('localhost'))
+    result = shell.InitShell()
+    if result != 0:
+      return result
 
   tests = []
   passed = []
   failed = []
   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("args", []) + extra_args
+    test_args = test_dict.get("args", [])
 
     print "Running %s...%s" % (test_name, ("\n" if args.verbose else "")),
     sys.stdout.flush()
 
     tests.append(test_name)
     assert test_type in ("gtest", "gtest_isolated")
     isolate = test_type == "gtest_isolated"
     result = gtest.run_apptest(config, shell, test_args, test, isolate)
     passed.extend([test_name] if result else [])
     failed.extend([] if result else [test_name])
@@ skipping 50 matching lines @@
     trie[path] = value
     return
   directory, rest = path.split('.', 1)
   if directory not in trie:
     trie[directory] = {}
   _AddPathToTrie(trie[directory], rest, value)
 
 
 if __name__ == '__main__':
   sys.exit(main())