diff --git a/tests/android/webview.spec.ts b/tests/android/webview.spec.ts index 46e0e385a0..ca7a114bb1 100644 --- a/tests/android/webview.spec.ts +++ b/tests/android/webview.spec.ts @@ -16,6 +16,10 @@ import { androidTest as test, expect } from './androidTest'; +test.beforeEach(async ({ androidDevice }) => { + await androidDevice.shell('am force-stop com.google.android.googlequicksearchbox'); +}); + test.afterEach(async ({ androidDevice }) => { await androidDevice.shell('am force-stop org.chromium.webview_shell'); await androidDevice.shell('am force-stop com.android.chrome'); diff --git a/tests/page/page-request-intercept.spec.ts b/tests/page/page-request-intercept.spec.ts index 33516606e7..837ce724f5 100644 --- a/tests/page/page-request-intercept.spec.ts +++ b/tests/page/page-request-intercept.spec.ts @@ -284,8 +284,9 @@ it('should fulfill popup main request using alias', async ({ page, server, isEle it('request.postData is not null when fetching FormData with a Blob', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/24077' } -}, async ({ server, page, browserName, isElectron, electronMajorVersion }) => { +}, async ({ server, page, browserName, isElectron, electronMajorVersion, isAndroid }) => { it.skip(isElectron && electronMajorVersion < 31); + it.fixme(isAndroid, 'potData is null for some reason'); it.fixme(browserName === 'webkit', 'The body is empty in WebKit when intercepting'); await page.goto(server.EMPTY_PAGE); await page.setContent(` diff --git a/utils/avd_install.sh b/utils/avd_install.sh index 9538719eea..a0586d6936 100755 --- a/utils/avd_install.sh +++ b/utils/avd_install.sh @@ -24,7 +24,7 @@ echo Installing emulator... yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install platform-tools emulator echo Installing platform SDK... -yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-34" +yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-35" echo Starting ADB... ${ANDROID_HOME}/platform-tools/adb devices diff --git a/utils/avd_recreate.sh b/utils/avd_recreate.sh index 0b2c08861e..81c3484907 100755 --- a/utils/avd_recreate.sh +++ b/utils/avd_recreate.sh @@ -13,7 +13,7 @@ if [[ "$(uname -m)" == "arm64" ]]; then ANDROID_ARCH="arm64-v8a" fi -${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager delete avd --name android34 || true -yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-34;google_apis;$ANDROID_ARCH" platform-tools emulator -echo "no" | ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager create avd --force --name android34 --device "Nexus 5X" --package "system-images;android-34;google_apis;$ANDROID_ARCH" +${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager delete avd --name android35 || true +yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-35;google_apis;$ANDROID_ARCH" platform-tools emulator +echo "no" | ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager create avd --force --name android35 --device "Nexus 5X" --package "system-images;android-35;google_apis;$ANDROID_ARCH" ${ANDROID_HOME}/emulator/emulator -list-avds diff --git a/utils/avd_start.sh b/utils/avd_start.sh index e054187895..1c3bc53418 100755 --- a/utils/avd_start.sh +++ b/utils/avd_start.sh @@ -9,8 +9,8 @@ fi bash $PWD/utils/avd_stop.sh echo "Starting emulator" -# nohup ${ANDROID_HOME}/emulator/emulator -avd android34 -gpu swiftshader & -nohup ${ANDROID_HOME}/emulator/emulator -avd android34 -no-audio -no-window -no-boot-anim -no-snapshot & +# nohup ${ANDROID_HOME}/emulator/emulator -avd android35 -gpu swiftshader & +nohup ${ANDROID_HOME}/emulator/emulator -avd android35 -no-audio -no-window -no-boot-anim -no-snapshot & ${ANDROID_HOME}/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done; input keyevent 82' ${ANDROID_HOME}/platform-tools/adb devices echo "Emulator started"