fix e2e test when you are already running a D-Bus session

This commit is contained in:
Henry Hiles 2026-11-13 22:34:10 -05:00
commit 89f395cede
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
2 changed files with 11 additions and 3 deletions

View file

@ -64,13 +64,21 @@ done
GOCACHE="$(go env GOCACHE)" GOCACHE="$(go env GOCACHE)"
export GOCACHE export GOCACHE
# shellcheck disable=SC2329
run_flutter_test() {
export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS%%;*}"
flutter test "$@" -d linux
}
export -f run_flutter_test
status=0 status=0
for file in "${files[@]}"; do for file in "${files[@]}"; do
name="$(basename "$file" .dart)" name="$(basename "$file" .dart)"
mkdir -p "$work/$name/data" "$work/$name/cache" mkdir -p "$work/$name/data" "$work/$name/cache"
XDG_DATA_HOME="$work/$name/data" XDG_CACHE_HOME="$work/$name/cache" \ XDG_DATA_HOME="$work/$name/data" XDG_CACHE_HOME="$work/$name/cache" \
dbus-run-session --config-file="$DBUS_SESSION_CONFIG" -- \ dbus-run-session --config-file="$DBUS_SESSION_CONFIG" -- \
flutter test "$file" -d linux \ bash -c 'run_flutter_test "$@"' -- "$file" \
--dart-define="NEXUS_E2E_HOMESERVER=$homeserver" "${flutter_args[@]}" || --dart-define="NEXUS_E2E_HOMESERVER=$homeserver" "${flutter_args[@]}" ||
status=$? status=$?
done done

View file

@ -1959,5 +1959,5 @@ packages:
source: hosted source: hosted
version: "2.2.4" version: "2.2.4"
sdks: sdks:
dart: ">=3.13.3 <4.0.0" dart: "3.13.3"
flutter: "3.47.4" flutter: "3.47.4"