Index: build/android/pylib/utils/test_environment.py |
diff --git a/build/android/pylib/utils/test_environment.py b/build/android/pylib/utils/test_environment.py |
deleted file mode 100644 |
index e78eb5ce801ffa9185fd5c0b69e5f56a7eaef570..0000000000000000000000000000000000000000 |
--- a/build/android/pylib/utils/test_environment.py |
+++ /dev/null |
@@ -1,47 +0,0 @@ |
-# 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. |
- |
-import logging |
-import psutil |
-import signal |
- |
-from pylib.device import device_errors |
-from pylib.device import device_utils |
- |
- |
-def _KillWebServers(): |
- for s in [signal.SIGTERM, signal.SIGINT, signal.SIGQUIT, signal.SIGKILL]: |
- signalled = [] |
- for server in ['lighttpd', 'webpagereplay']: |
- for p in psutil.process_iter(): |
- try: |
- if not server in ' '.join(p.cmdline): |
- continue |
- logging.info('Killing %s %s %s', s, server, p.pid) |
- p.send_signal(s) |
- signalled.append(p) |
- except Exception as e: |
- logging.warning('Failed killing %s %s %s', server, p.pid, e) |
- for p in signalled: |
- try: |
- p.wait(1) |
- except Exception as e: |
- logging.warning('Failed waiting for %s to die. %s', p.pid, e) |
- |
- |
-def CleanupLeftoverProcesses(): |
- """Clean up the test environment, restarting fresh adb and HTTP daemons.""" |
- _KillWebServers() |
- device_utils.RestartServer() |
- |
- def cleanup_device(d): |
- d.old_interface.RestartAdbdOnDevice() |
- try: |
- d.EnableRoot() |
- except device_errors.CommandFailedError as e: |
- logging.error(str(e)) |
- d.WaitUntilFullyBooted() |
- |
- device_utils.DeviceUtils.parallel().pMap(cleanup_device) |
- |