Use adb serial to assert adb connection in e2e tests.

Bug: b/519670213

Author: ser-io

e2etests/cvdr/common_utils.sh

@@ -16,3 +16,15 @@ function validate_components() {
 function cvdr() {
     HOME=${PWD} CVDR_USER_CONFIG_PATH=${CVDR_CONFIG_PATH} ${CVDR_PATH} "$@"
 }
+
+
+function verify_adb_connection() {
+  # TODO(b/448209030): Retrieve serial of the device from the output of cvdr list.
+  local cvdr_create_output="${1}"
+  adb_serial=$(echo -e "${cvdr_create_output}" | grep "ADB:" | grep -oE "[^ ]+$")
+  if [[ -z "${adb_serial}" ]]; then
+    echo "Device is not adb connected"
+    exit 1
+  fi
+  timeout 30s adb -s ${adb_serial} wait-for-device
+}

e2etests/cvdr/cvdr_create_with_branch_test.sh

@@ -13,11 +13,9 @@ cleanup() {
 }
 trap cleanup EXIT
 
-cvdr create \
-    --host=${HOSTNAME} \
-    --branch=aosp-android-latest-release \
-    --build_target=aosp_cf_x86_64_only_phone-userdebug
+out=$(cvdr create \
+  --host=${HOSTNAME} \
+  --branch=aosp-android-latest-release \
+  --build_target=aosp_cf_x86_64_only_phone-userdebug)
 
-# Check ADB connection
-# TODO(b/448209030): Retrieve serial of the device from the output of cvdr list.
-adb shell uptime
+verify_adb_connection "${out}"

e2etests/cvdr/cvdr_create_with_local_srcs_test.sh

@@ -24,11 +24,9 @@ cleanup() {
 }
 trap cleanup EXIT
 
-cvdr create \
-    --host=${HOSTNAME} \
-    --local_cvd_host_pkg_src=${CVD_HOST_PKG} \
-    --local_images_zip_src=${IMAGE_ZIP}
+out=$(cvdr create \
+  --host=${HOSTNAME} \
+  --local_cvd_host_pkg_src=${CVD_HOST_PKG} \
+  --local_images_zip_src=${IMAGE_ZIP})
 
-# Check ADB connection
-# TODO(b/448209030): Retrieve serial of the device from the output of cvdr list.
-adb shell uptime
+verify_adb_connection "${out}"