[Android] Stop tearing down the test runner's SIGTERM handler.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 """Runs all types of tests from one unified interface."""
 
 import argparse
 import collections
 import contextlib
 import itertools
 import logging
 import os
 import signal
 import sys
 import threading
 import traceback
 import unittest
 
 import devil_chromium
 from devil import base_error
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_utils
 from devil.android import forwarder
 from devil.android import ports
 from devil.utils import reraiser_thread
 from devil.utils import run_tests_helper
-from devil.utils import signal_handler
 
 from pylib import constants
 from pylib.base import base_test_result
 from pylib.base import environment_factory
 from pylib.base import test_dispatcher
 from pylib.base import test_instance_factory
 from pylib.base import test_run_factory
 from pylib.constants import host_paths
 from pylib.linker import setup as linker_setup
 from pylib.results import json_results
@@ skipping 670 matching lines @@
       # pylint: disable=protected-access
       thread_stack = ''.join(traceback.format_stack(
           sys._current_frames()[live_thread.ident]))
       msg.extend([
         'Thread "%s" (ident: %s) is currently running:' % (
             live_thread.name, live_thread.ident),
         thread_stack])
 
     infra_error('\n'.join(msg))
 
-  sigterm_handler = signal_handler.SignalHandler(
-      signal.SIGTERM, unexpected_sigterm)
+  signal.signal(signal.SIGTERM, unexpected_sigterm)
 
   ### Set up results handling.
   # TODO(jbudorick): Rewrite results handling.
 
   # all_raw_results is a list of lists of
   # base_test_result.TestRunResults objects. Each instance of
   # TestRunResults contains all test results produced by a single try,
   # while each list of TestRunResults contains all tries in a single
   # iteration.
   all_raw_results = []
@@ skipping 21 matching lines @@
 
   ### Set up test objects.
 
   env = environment_factory.CreateEnvironment(args, infra_error)
   test_instance = test_instance_factory.CreateTestInstance(args, infra_error)
   test_run = test_run_factory.CreateTestRun(
       args, env, test_instance, infra_error)
 
   ### Run.
 
-  with sigterm_handler, json_writer, env, test_instance, test_run:
+  with json_writer, env, test_instance, test_run:
 
     repetitions = (xrange(args.repeat + 1) if args.repeat >= 0
                    else itertools.count())
     result_counts = collections.defaultdict(
         lambda: collections.defaultdict(int))
     iteration_count = 0
     for _ in repetitions:
       raw_results = test_run.RunTests()
       if not raw_results:
         continue
@@ skipping 105 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())