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

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

Issue 1142413002: [Android] Fix android_profiling_helper pulling lib from device. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix code + fix testCreateSymFs Created 5 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 side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py
diff --git a/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py b/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py
index 94b0864051c83cf5f29c13824cd84e050da10ee0..cbdc898f6a359a8e7d2b75091f98174d5dde04bc 100644
--- a/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py
+++ b/tools/telemetry/telemetry/core/platform/profiler/android_profiling_helper_unittest.py
@@ -96,9 +96,7 @@ class TestAndroidProfilingHelperTabTestCase(tab_test_case.TabTestCase):
browser_backend = self._browser._browser_backend
self._device = browser_backend._adb.device()
- # Test fails: crbug.com/437081
- # @decorators.Enabled('android')
- @decorators.Disabled
+ @decorators.Enabled('android')
def testCreateSymFs(self):
# pylint: disable=W0212
browser_pid = self._browser._browser_backend.pid
@@ -115,7 +113,7 @@ class TestAndroidProfilingHelperTabTestCase(tab_test_case.TabTestCase):
# Check that we have kernel symbols.
assert os.path.exists(kallsyms)
- is_unstripped = re.compile(r'^/data/app/.*\.so$')
+ is_unstripped = re.compile(r'^/data/app(-lib)?/.*\.so$')
has_unstripped = False
# Check that all requested libraries are present.
@@ -137,4 +135,4 @@ class TestAndroidProfilingHelperTabTestCase(tab_test_case.TabTestCase):
self._device.PullFile('/system/lib/libc.so', libc.name)
path = android_profiling_helper.GetToolchainBinaryPath(libc.name,
'objdump')
- assert os.path.exists(path)
+ assert path and os.path.exists(path)

Powered by Google App Engine
This is Rietveld 408576698