Add `enable-network` flag for AVDs to unblock video_player tests
Change-Id: I4281c2ccab13053476d0684acc2bc2fb7550322f
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/61660
Reviewed-by: Christopher Fujino <fujino@google.com>
Commit-Queue: Camille Simon <camillesimon@google.com>
diff --git a/recipe_modules/android_virtual_device/api.py b/recipe_modules/android_virtual_device/api.py
index e24cff3..e1ee7d4 100644
--- a/recipe_modules/android_virtual_device/api.py
+++ b/recipe_modules/android_virtual_device/api.py
@@ -150,6 +150,9 @@
'start',
'--debug-tags',
'all',
+ # Enables network access for AVDs that may need it for running tests.
+ # See https://github.com/flutter/flutter/issues/160691 for context.
+ '--enable-network',
'--avd-config',
avd_config
],
diff --git a/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_fails.json b/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_fails.json
index 2c5c6af..0822bd6 100644
--- a/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_fails.json
+++ b/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_fails.json
@@ -279,6 +279,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
@@ -491,6 +492,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
@@ -703,6 +705,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
diff --git a/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_pass_on_retry.json b/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_pass_on_retry.json
index a7e5c96..bb20c97 100644
--- a/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_pass_on_retry.json
+++ b/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_pass_on_retry.json
@@ -279,6 +279,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
@@ -491,6 +492,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
diff --git a/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json b/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json
index 9e104dd..f10dcf9 100644
--- a/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json
+++ b/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json
@@ -276,6 +276,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
@@ -778,6 +779,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
diff --git a/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json b/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json
index 9e104dd..f10dcf9 100644
--- a/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json
+++ b/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json
@@ -276,6 +276,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
@@ -778,6 +779,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
diff --git a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_start_fails.json b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_start_fails.json
index 61d19ac..36e6142 100644
--- a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_start_fails.json
+++ b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_start_fails.json
@@ -279,6 +279,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
@@ -417,6 +418,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
@@ -555,6 +557,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
diff --git a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started.json b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started.json
index 9e104dd..f10dcf9 100644
--- a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started.json
+++ b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started.json
@@ -276,6 +276,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
@@ -778,6 +779,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
diff --git a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started_and stopped_processes_killed.json b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started_and stopped_processes_killed.json
index 9e104dd..f10dcf9 100644
--- a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started_and stopped_processes_killed.json
+++ b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started_and stopped_processes_killed.json
@@ -276,6 +276,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
@@ -778,6 +779,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
diff --git a/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started and stopped, processes killed.json b/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started and stopped, processes killed.json
index 8f9e344..7d0f98c 100644
--- a/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started and stopped, processes killed.json
+++ b/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started and stopped, processes killed.json
@@ -276,6 +276,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_34_google_apis_x64.textpb"
],
@@ -778,6 +779,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_34_google_apis_x64.textpb"
],
diff --git a/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started.json b/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started.json
index 8f9e344..7d0f98c 100644
--- a/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started.json
+++ b/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started.json
@@ -276,6 +276,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_34_google_apis_x64.textpb"
],
@@ -778,6 +779,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_34_google_apis_x64.textpb"
],
diff --git a/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started and stopped, processes killed.json b/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started and stopped, processes killed.json
index 3d9b7e2..e8016aa 100644
--- a/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started and stopped, processes killed.json
+++ b/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started and stopped, processes killed.json
@@ -276,6 +276,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/generic_android28.textpb"
],
@@ -778,6 +779,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/generic_android28.textpb"
],
diff --git a/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started.json b/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started.json
index 3d9b7e2..e8016aa 100644
--- a/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started.json
+++ b/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started.json
@@ -276,6 +276,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/generic_android28.textpb"
],
@@ -778,6 +779,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/generic_android28.textpb"
],
diff --git a/recipes/devicelab/devicelab_drone.expected/emulator-test.json b/recipes/devicelab/devicelab_drone.expected/emulator-test.json
index 153e09e..bc0d800 100644
--- a/recipes/devicelab/devicelab_drone.expected/emulator-test.json
+++ b/recipes/devicelab/devicelab_drone.expected/emulator-test.json
@@ -697,6 +697,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
diff --git a/recipes/packages/packages.expected/emulator-test.json b/recipes/packages/packages.expected/emulator-test.json
index 8139520..c02516a 100644
--- a/recipes/packages/packages.expected/emulator-test.json
+++ b/recipes/packages/packages.expected/emulator-test.json
@@ -853,6 +853,7 @@
"start",
"--debug-tags",
"all",
+ "--enable-network",
"--avd-config",
"[CACHE]/avd/src/tools/android/avd/proto/android_31_google_apis_x64.textpb"
],
