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

Unified Diff: scripts/slave/recipe_modules/chromium_android/example.py

Issue 1511403002: Revert "[Android] Add context manager to record logcat during step(s)." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipe_modules/chromium_android/example.py
diff --git a/scripts/slave/recipe_modules/chromium_android/example.py b/scripts/slave/recipe_modules/chromium_android/example.py
index 24ea62687f63586d1d4849719c4d988a8009673a..030fcd99a18a0b5fae06d8cdc68b12fee0bc962d 100644
--- a/scripts/slave/recipe_modules/chromium_android/example.py
+++ b/scripts/slave/recipe_modules/chromium_android/example.py
@@ -167,33 +167,28 @@ def RunSteps(api, buildername):
except api.step.StepFailure as f:
failure = f
- with api.chromium_android.logcat('AndroidWebViewTest'):
- api.chromium_android.run_instrumentation_suite(
- name='AndroidWebViewTest',
- apk_under_test=api.chromium_android.apk_path('AndroidWebView.apk'),
- test_apk=api.chromium_android.apk_path('AndroidWebViewTest.apk'),
- isolate_file_path='android_webview/android_webview_test_apk.isolate',
- flakiness_dashboard='test-results.appspot.com',
- annotation='SmallTest',
- except_annotation='FlakyTest',
- screenshot=True,
- official_build=True,
- host_driven_root=api.path['checkout'].join('chrome', 'test'),
- timeout_scale=config.get('timeout_scale'))
- with api.chromium_android.logcat('unittests'):
- api.chromium_android.run_test_suite(
- 'unittests',
- isolate_file_path=api.path['checkout'].join('some_file.isolate'),
- gtest_filter='WebRtc*',
- tool='asan')
-
+ api.chromium_android.run_instrumentation_suite(
+ name='AndroidWebViewTest',
+ apk_under_test=api.chromium_android.apk_path('AndroidWebView.apk'),
+ test_apk=api.chromium_android.apk_path('AndroidWebViewTest.apk'),
+ isolate_file_path='android_webview/android_webview_test_apk.isolate',
+ flakiness_dashboard='test-results.appspot.com',
+ annotation='SmallTest',
+ except_annotation='FlakyTest',
+ screenshot=True,
+ official_build=True,
+ host_driven_root=api.path['checkout'].join('chrome', 'test'),
+ timeout_scale=config.get('timeout_scale'))
+ api.chromium_android.run_test_suite(
+ 'unittests',
+ isolate_file_path=api.path['checkout'].join('some_file.isolate'),
+ gtest_filter='WebRtc*',
+ tool='asan')
if not failure:
api.chromium_android.run_bisect_script(extra_src='test.py',
path_to_config='test.py')
-
- logcat_file = api.chromium.output_dir.join('full_logcat')
- api.chromium_android.logcat_dump(output_logcat_file=logcat_file)
- api.chromium_android.stack_tool_steps(logcat_file=logcat_file)
+ api.chromium_android.logcat_dump()
+ api.chromium_android.stack_tool_steps()
if config.get('coverage', False):
api.chromium_android.coverage_report()

Powered by Google App Engine
This is Rietveld 408576698