chore: interop: allow concurrent runs on the same machine

Before we hadn't provided a concrete device name, so adb couldn't figure
out which one to use in case there were multiple.

Author: SimonThormeyer

interop/src/clients/corecrypto/android.rs

@@ -196,15 +196,10 @@ impl CoreCryptoAndroidClient {
         let client_id_base64 = general_purpose::STANDARD.encode(client_id_str.as_str());
         let ciphersuite = CIPHERSUITE_IN_USE as u16;
 
-        let output = Command::new("adb")
-            .args(["get-serialno"])
-            .output()
-            .expect("Failed to get connected android device");
-
-        let device = String::from_utf8(output.stdout)
-            .expect("output is not valid utf8")
-            .trim()
-            .to_string();
+        let device = std::env::var_os("ADB_DEVICE")
+            .expect("ADB_DEVICE must be set")
+            .into_string()
+            .expect("ADB_DEVICE must have valid string encoding");
         let driver = SimulatorDriver::new(device, "com.wire.androidinterop".into());
         log::info!("initialising core crypto with ciphersuite {ciphersuite}");
         driver

scripts/run-android-tests.sh

@@ -6,12 +6,11 @@ if [[ "${GITHUB_ACTIONS}" == "true" ]]; then
     sh ./setup-android-emulator.sh
 fi
 
-./start-android-emulator.sh
+eval "$(./start-android-emulator.sh | grep '^ADB_DEVICE=')"
 
 cleanup() {
   echo "Shutting down Android emulator via adb"
-  adb_device=emulator-$((27000 + $(id -u)))
-  $ANDROID_HOME/platform-tools/adb -s $adb_device emu kill
+  $ANDROID_HOME/platform-tools/adb -s "$ADB_DEVICE" emu kill
 }
 
 trap cleanup EXIT

scripts/run-interop-test.sh

@@ -14,8 +14,7 @@ cleanup() {
   fi
 
   echo "Shutting down Android emulator via adb"
-  adb_device=emulator-$((27000 + $(id -u)))
-  adb -s $adb_device emu kill
+  adb -s $ADB_DEVICE emu kill
 }
 
 trap cleanup EXIT
@@ -37,7 +36,7 @@ if [ "$OS" = "Darwin" ]; then
     cd $scripts
 fi
 
-./start-android-emulator.sh
+eval "$(./start-android-emulator.sh | grep '^ADB_DEVICE=')"
 
 cd ../interop/src/clients
 

scripts/start-android-emulator.sh

@@ -56,3 +56,5 @@ until adb -s $ADB_DEVICE shell getprop sys.boot_completed | grep -qm 1 '1'; do
 done
 
 echo "Emulator started. PID: $EMULATOR_PID"
+
+echo  "ADB_DEVICE=$ADB_DEVICE"