tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py - Issue 1165463010: [Android] Log exceptions thrown by newly converted DeviceUtils calls in telemetry.

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

Unified Diff: tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py

Issue 1165463010: [Android] Log exceptions thrown by newly converted DeviceUtils calls in telemetry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py ('k') | tools/telemetry/telemetry/core/platform/profiler/v8_profiler.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py

diff --git a/tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py

index 6ad22c4e664257c1c06746506e4eb3be2b9e1b40..6b62474aa09e3d111032614932f64a79a261cd5f 100644

--- a/tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py

+++ b/tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py

@@ -2,6 +2,7 @@

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

# found in the LICENSE file.

+import logging

import os

import signal

import subprocess

@@ -44,7 +45,11 @@ class _TCPDumpProfilerAndroid(object):

self._proc.terminate()

host_dump = os.path.join(self._output_path,

os.path.basename(self._DEVICE_DUMP_FILE))

- self._adb.device().PullFile(self._DEVICE_DUMP_FILE, host_dump)

+ try:

+ self._adb.device().PullFile(self._DEVICE_DUMP_FILE, host_dump)

+ except:

+ logging.exception('New exception caused by DeviceUtils conversion')

+ raise

print 'TCP dump available at: %s ' % host_dump

print 'Use Wireshark to open it.'

return host_dump