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

Unified Diff: scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__basic.json

Issue 2402303003: Enable new device monitor everywhere and launch it earlier in the build. (Closed)
Patch Set: With expectations Created 4 years, 2 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: scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__basic.json
diff --git a/scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__basic.json b/scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__basic.json
index 81a7468edd7911a128f140df31df9d02580cde67..acfc5eec68c2743f64d389383f528989a6b2bbec 100644
--- a/scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__basic.json
+++ b/scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__basic.json
@@ -258,6 +258,24 @@
"cmd": [
"python",
"-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
+ "--action",
+ "restart",
+ "--pid-file-path",
+ "/tmp/device_monitor.pid",
+ "--",
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
+ ],
+ "name": "spawn_device_monitor"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
"--verbose",
"--adb-path",
@@ -427,24 +445,6 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
- "--action",
- "restart",
- "--pid-file-path",
- "/tmp/device_monitor.pid",
- "--",
- "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
- "[\"07a00ca4\"]",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
- ],
- "name": "spawn_device_monitor"
- },
- {
- "cmd": [
- "python",
- "-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/src/chrome/VERSION",
"/path/to/tmp/"

Powered by Google App Engine
This is Rietveld 408576698