Use 'adb reconnect device' instead of 'kill-server'
Change-Id: Id7f8c484b5715badc73fe611dfec8ccae6ebdb7b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/479718
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py
index 5d707b5..ff8347d 100644
--- a/infra/bots/recipe_modules/flavor/android.py
+++ b/infra/bots/recipe_modules/flavor/android.py
@@ -90,7 +90,7 @@
self.m.run(self.m.step,
'kill adb server after failure of \'%s\' (attempt %d)' % (
title, attempt),
- cmd=[self.ADB_BINARY, 'kill-server'],
+ cmd=[self.ADB_BINARY, 'reconnect', 'device'],
infra_step=True, timeout=30, abort_on_failure=False,
fail_build_on_failure=False)
self.m.run(self.m.step,
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
index 06dda12..974e028 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
@@ -898,7 +898,8 @@
{
"cmd": [
"/opt/infra-android/tools/adb",
- "kill-server"
+ "reconnect",
+ "device"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
index 9868cc4..7ab460b 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
@@ -202,7 +202,8 @@
{
"cmd": [
"/opt/infra-android/tools/adb",
- "kill-server"
+ "reconnect",
+ "device"
],
"cwd": "[START_DIR]/skia",
"env": {
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
index 938325c..0caebbc 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
@@ -202,7 +202,8 @@
{
"cmd": [
"/opt/infra-android/tools/adb",
- "kill-server"
+ "reconnect",
+ "device"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -252,7 +253,8 @@
{
"cmd": [
"/opt/infra-android/tools/adb",
- "kill-server"
+ "reconnect",
+ "device"
],
"cwd": "[START_DIR]/skia",
"env": {
