build/android/pylib/utils/test_environment.py - Issue 265743002: [Android] Switch to new interfaces of GetAVDs and RestartAdbServer.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 265743002: [Android] Switch to new interfaces of GetAVDs and RestartAdbServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 7 months 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

« build/android/pylib/device/device_utils.py ('K') | « build/android/pylib/device/device_utils_test.py ('k') | no next file » | no next file with comments »

OLD	NEW
1 # Copyright 2013 The Chromium Authors. All rights reserved.	1 # Copyright 2013 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 import logging	5 import logging

6 import psutil	6 import psutil

7 import signal	7 import signal

8	8

9 from pylib import android_commands	9 from pylib import android_commands

10 from pylib.device import device_utils	10 from pylib.device import device_utils

(...skipping 20 matching lines...) Expand all Loading...
31	31

32	32

33 def CleanupLeftoverProcesses():	33 def CleanupLeftoverProcesses():

34 """Clean up the test environment, restarting fresh adb and HTTP daemons."""	34 """Clean up the test environment, restarting fresh adb and HTTP daemons."""

35 _KillWebServers()	35 _KillWebServers()

36 did_restart_host_adb = False	36 did_restart_host_adb = False

37 for device_serial in android_commands.GetAttachedDevices():	37 for device_serial in android_commands.GetAttachedDevices():

38 device = device_utils.DeviceUtils(device_serial)	38 device = device_utils.DeviceUtils(device_serial)

39 # Make sure we restart the host adb server only once.	39 # Make sure we restart the host adb server only once.

40 if not did_restart_host_adb:	40 if not did_restart_host_adb:

41 device.old_interface.RestartAdbServer()	41 device_utils.RestartServer()

42 did_restart_host_adb = True	42 did_restart_host_adb = True

43 device.old_interface.RestartAdbdOnDevice()	43 device.old_interface.RestartAdbdOnDevice()

44 device.old_interface.EnableAdbRoot()	44 device.old_interface.EnableAdbRoot()

45 device.old_interface.WaitForDevicePm()	45 device.old_interface.WaitForDevicePm()

46	46

OLD	NEW