Skip to content

Commit a84412f

Browse files
test: use default driver for android tests
1 parent d2134f6 commit a84412f

7 files changed

Lines changed: 5 additions & 17 deletions
4.61 KB
Loading
-791 Bytes
Loading
8.48 KB
Loading
58 KB
Loading
118 KB
Loading
114 KB
Loading

.maestro/scripts/run-tests.sh

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
# ./run-tests.sh --platform android --update-screenshots .maestro/enrichedInput/flows/core_controls_smoke.yaml
1818
# ./run-tests.sh --platform ios --rebuild
1919
#
20-
# Uses the local maestro-runner binary:
21-
# Android → --driver devicelab
22-
# iOS → default driver
20+
# Uses the local maestro-runner binary with the default driver on both platforms.
2321

2422
set -euo pipefail
2523

@@ -67,19 +65,9 @@ esac
6765

6866
DEVICE_ID=$("$SETUP" | tee /dev/stderr | grep "^DEVICE_ID=" | cut -d= -f2)
6967

70-
# Android uses DeviceLab; iOS keeps the runner default driver.
71-
DRIVER_ARGS=""
72-
if [ "$PLATFORM" = android ]; then
73-
DRIVER_ARGS="--driver devicelab"
74-
fi
75-
7668
echo "=== Using maestro-runner: $MAESTRO_BIN ==="
7769
"$MAESTRO_BIN" --version || true
78-
if [ -n "$DRIVER_ARGS" ]; then
79-
echo "=== Driver: devicelab (android) ==="
80-
else
81-
echo "=== Driver: default (ios) ==="
82-
fi
70+
echo "=== Driver: default ==="
8371

8472
app_installed() {
8573
if [ "$PLATFORM" = ios ]; then
@@ -146,14 +134,14 @@ run_maestro() {
146134
tmp=$(mktemp)
147135
# `script` allocates a pseudo-TTY so the runner keeps
148136
# ANSI colors when piped through `tee`.
149-
# Global flags (--device, --driver, --env, tags) come before `test`.
137+
# Global flags (--device, --env, tags) come before `test`.
150138
if [[ "$OSTYPE" == darwin* ]]; then
151139
# shellcheck disable=SC2086
152-
script -q /dev/null "$MAESTRO_BIN" --platform "$PLATFORM" --device "$DEVICE_ID" $DRIVER_ARGS $EXTRA "$@" test $FLOWS 2>&1 | tee "$tmp"
140+
script -q /dev/null "$MAESTRO_BIN" --platform "$PLATFORM" --device "$DEVICE_ID" $EXTRA "$@" test $FLOWS 2>&1 | tee "$tmp"
153141
else
154142
local cmd
155143
# shellcheck disable=SC2086
156-
cmd=$(printf '%q ' "$MAESTRO_BIN" --platform "$PLATFORM" --device "$DEVICE_ID" $DRIVER_ARGS $EXTRA "$@" test $FLOWS)
144+
cmd=$(printf '%q ' "$MAESTRO_BIN" --platform "$PLATFORM" --device "$DEVICE_ID" $EXTRA "$@" test $FLOWS)
157145
script -qc "$cmd" /dev/null 2>&1 | tee "$tmp"
158146
fi
159147
rc=${PIPESTATUS[0]}

0 commit comments

Comments
 (0)