Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Side by Side Diff: build/android/pylib/utils/test_environment.py

Issue 62953024: [Telemetry] Refactor common Android cleanup functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + deflake RestartAdbdOnDevice Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file.
4
5 import logging
6 import os
7 import psutil
8
9 from pylib import android_commands
10 from pylib import ports
11
12 def _KillWebServers():
13 for retry in range(5):
tonyg 2013/11/25 15:46:33 Style nit: use xrange when it is constant.
bulach 2013/11/27 12:10:53 just in case :) python3 has removed xrange, there'
Primiano Tucci (use gerrit) 2013/11/27 15:14:41 Ah right (both). It looks, however, that there is
14 for server in ['lighttpd', 'web-page-replay']:
15 pids = [p.pid for p in psutil.process_iter() if server in p.name]
16 for pid in pids:
17 try:
18 logging.warning('Killing %s %s', server, pid)
19 os.kill(pid, signal.SIGQUIT)
20 except Exception as e:
21 logging.warning('Failed killing %s %s %s', server, pid, e)
22
23
24 def CleanupPendingProcesses():
tonyg 2013/11/25 15:46:33 Would CleanupLeftoverProcesses() be a better name?
Primiano Tucci (use gerrit) 2013/11/25 17:26:51 Why not, sounds good to me.
25 """Clean up the test environment, restarting fresh adb and HTTP daemons."""
26 _KillWebServers()
27 did_restart_host_adb = False
28 for device in android_commands.GetAttachedDevices():
tonyg 2013/11/25 15:46:33 Is this a problem for sharding? Could we kill an a
Primiano Tucci (use gerrit) 2013/11/25 17:26:51 Hmm, to be honest I have no idea how sharding is
bulach 2013/11/27 12:10:53 tl;dr; it's not a problem as it is right now :) l
29 adb = android_commands.AndroidCommands(device)
30 # Make sure we restart the host adb server only once.
31 if not did_restart_host_adb:
32 adb.RestartAdbServer()
33 did_restart_host_adb = True
34 adb.RestartAdbdOnDevice()
35 adb.EnableAdbRoot()
36 adb.WaitForDevicePm()
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698