Skip to content

Commit d9ed9b9

Browse files
fix: run android tests on pixel_7
1 parent 5bcedbe commit d9ed9b9

5 files changed

Lines changed: 10 additions & 30 deletions

File tree

-1 Bytes
Loading
-1 Bytes
Loading
0 Bytes
Loading

.maestro/scripts/setup-android-emulator.sh

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euo pipefail
33

44
API_LEVEL="36"
5-
DEVICE_ID="pixel_9"
5+
DEVICE_ID="pixel_7"
66
ARCH=$(uname -m)
77
if [ "$ARCH" = "arm64" ] || [ "$ARCH" = "aarch64" ]; then
88
ABI="arm64-v8a"
@@ -11,7 +11,7 @@ else
1111
fi
1212
TAG="google_apis_playstore"
1313
SYSTEM_IMAGE="system-images;android-${API_LEVEL};${TAG};${ABI}"
14-
AVD_NAME="Pixel9-API${API_LEVEL}-Enriched"
14+
AVD_NAME="Pixel7-API${API_LEVEL}-Enriched"
1515
PORT=5570
1616
SERIAL="emulator-${PORT}"
1717

@@ -39,28 +39,18 @@ if ! sdkmanager --list_installed 2>/dev/null | grep -q "system-images;android-${
3939
sdkmanager "$SYSTEM_IMAGE"
4040
fi
4141

42-
# Pixel 9 screen specs injected into config.ini only when the native profile isn't available.
43-
PIXEL_9_LCD_WIDTH="1080"
44-
PIXEL_9_LCD_HEIGHT="2424"
45-
PIXEL_9_LCD_DENSITY="420"
46-
47-
AVD_DEVICE_PROFILE="$DEVICE_ID"
48-
PATCH_PIXEL9_DIMENSIONS=""
4942
if ! avdmanager list device -c | grep -qx "$DEVICE_ID"; then
50-
AVD_DEVICE_PROFILE="pixel_7"
51-
PATCH_PIXEL9_DIMENSIONS="true"
52-
if ! avdmanager list device -c | grep -qx "$AVD_DEVICE_PROFILE"; then
53-
echo "Error: Neither '$DEVICE_ID' nor fallback '$AVD_DEVICE_PROFILE' device definition found."
54-
exit 1
55-
fi
56-
echo "Warning: '$DEVICE_ID' not found, using '$AVD_DEVICE_PROFILE' as base and patching Pixel 9 screen dimensions."
43+
echo "Error: Device definition '$DEVICE_ID' not found."
44+
exit 1
5745
fi
5846

5947
if ! avdmanager list avd -c | grep -qx "${AVD_NAME}"; then
6048
echo "Creating AVD '$AVD_NAME'..."
61-
CREATE_CMD=(avdmanager create avd --name "$AVD_NAME" --device "$AVD_DEVICE_PROFILE" --package "$SYSTEM_IMAGE")
62-
[ -z "$PATCH_PIXEL9_DIMENSIONS" ] && CREATE_CMD+=(--skin "$DEVICE_ID")
63-
echo "no" | "${CREATE_CMD[@]}"
49+
echo "no" | avdmanager create avd \
50+
--name "$AVD_NAME" \
51+
--device "$DEVICE_ID" \
52+
--package "$SYSTEM_IMAGE" \
53+
--skin "$DEVICE_ID"
6454
fi
6555

6656
AVD_CONFIG="$HOME/.android/avd/${AVD_NAME}.avd/config.ini"
@@ -69,16 +59,6 @@ if [ -f "$AVD_CONFIG" ]; then
6959
grep -q "^hw.keyboard=" "$AVD_CONFIG" || echo "hw.keyboard=yes" >> "$AVD_CONFIG"
7060
sed -i.bak 's/^hw\.mainKeys=.*/hw.mainKeys=yes/' "$AVD_CONFIG"
7161
grep -q "^hw.mainKeys=" "$AVD_CONFIG" || echo "hw.mainKeys=yes" >> "$AVD_CONFIG"
72-
# Only patch screen dimensions when using the fallback profile; the native pixel_9
73-
# profile already sets the correct values via the skin.
74-
if [ -n "$PATCH_PIXEL9_DIMENSIONS" ]; then
75-
sed -i.bak "s/^hw\.lcd\.width=.*/hw.lcd.width=${PIXEL_9_LCD_WIDTH}/" "$AVD_CONFIG"
76-
grep -q "^hw.lcd.width=" "$AVD_CONFIG" || echo "hw.lcd.width=${PIXEL_9_LCD_WIDTH}" >> "$AVD_CONFIG"
77-
sed -i.bak "s/^hw\.lcd\.height=.*/hw.lcd.height=${PIXEL_9_LCD_HEIGHT}/" "$AVD_CONFIG"
78-
grep -q "^hw.lcd.height=" "$AVD_CONFIG" || echo "hw.lcd.height=${PIXEL_9_LCD_HEIGHT}" >> "$AVD_CONFIG"
79-
sed -i.bak "s/^hw\.lcd\.density=.*/hw.lcd.density=${PIXEL_9_LCD_DENSITY}/" "$AVD_CONFIG"
80-
grep -q "^hw.lcd.density=" "$AVD_CONFIG" || echo "hw.lcd.density=${PIXEL_9_LCD_DENSITY}" >> "$AVD_CONFIG"
81-
fi
8262
rm -f "$AVD_CONFIG.bak"
8363
fi
8464

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ The target devices are:
9292
| Platform | Device | OS |
9393
| -------- | --------- | ----------------------------- |
9494
| iOS | iPhone 17 | iOS 26.2 |
95-
| Android | Pixel 9 | API 36 "Baklava" (Android 16) |
95+
| Android | Pixel 7 | API 36 "Baklava" (Android 16) |
9696

9797
#### Running E2E tests
9898

0 commit comments

Comments
 (0)