Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

test: update to android-35 SDK (Android 15) (#32430)

Browse source
This commit is contained in:
Max Schmitt 2024-09-06 14:27:56 +02:00 committed by GitHub
parent 0e3f4736cc
commit ed303208b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/android/webview.spec.ts
View file

@ -16,6 +16,10 @@
import { androidTest as test, expect } from './androidTest'; 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 }) => { test.afterEach(async ({ androidDevice }) => {
await androidDevice.shell('am force-stop org.chromium.webview_shell'); await androidDevice.shell('am force-stop org.chromium.webview_shell');
await androidDevice.shell('am force-stop com.android.chrome'); await androidDevice.shell('am force-stop com.android.chrome');

3
tests/page/page-request-intercept.spec.ts
View file

@ -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', { it('request.postData is not null when fetching FormData with a Blob', {
annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/24077' } 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.skip(isElectron && electronMajorVersion < 31);
it.fixme(isAndroid, 'postData is null for some reason');
it.fixme(browserName === 'webkit', 'The body is empty in WebKit when intercepting'); it.fixme(browserName === 'webkit', 'The body is empty in WebKit when intercepting');
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
await page.setContent(` await page.setContent(`

2
utils/avd_install.sh
View file

@ -24,7 +24,7 @@ echo Installing emulator...
yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install platform-tools emulator yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install platform-tools emulator
echo Installing platform SDK... echo Installing platform SDK...
yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-33" yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-35"
echo Starting ADB... echo Starting ADB...
${ANDROID_HOME}/platform-tools/adb devices ${ANDROID_HOME}/platform-tools/adb devices

6
utils/avd_recreate.sh
View file

@ -13,7 +13,7 @@ if [[ "$(uname -m)" == "arm64" ]]; then
ANDROID_ARCH="arm64-v8a" ANDROID_ARCH="arm64-v8a"
fi fi
${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager delete avd --name android33 || true ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager delete avd --name android35 || true
yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-33;google_apis;$ANDROID_ARCH" platform-tools emulator 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 android33 --device "Nexus 5X" --package "system-images;android-33;google_apis;$ANDROID_ARCH" 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 ${ANDROID_HOME}/emulator/emulator -list-avds

6
utils/avd_start.sh
View file

@ -9,15 +9,15 @@ fi
bash $PWD/utils/avd_stop.sh bash $PWD/utils/avd_stop.sh
echo "Starting emulator" echo "Starting emulator"
# nohup ${ANDROID_HOME}/emulator/emulator -avd android33 -gpu swiftshader & # nohup ${ANDROID_HOME}/emulator/emulator -avd android35 -gpu swiftshader &
nohup ${ANDROID_HOME}/emulator/emulator -avd android33 -no-audio -no-window -no-boot-anim -no-snapshot & 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 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 ${ANDROID_HOME}/platform-tools/adb devices
echo "Emulator started" echo "Emulator started"
echo "Installing Chromium WebView" echo "Installing Chromium WebView"
# See here for the latest revision: https://storage.googleapis.com/chromium-browser-snapshots/Android/LAST_CHANGE # See here for the latest revision: https://storage.googleapis.com/chromium-browser-snapshots/Android/LAST_CHANGE
CHROMIUM_ANDROID_REVISION="1190572" CHROMIUM_ANDROID_REVISION="1340145"
WEBVIEW_TMP_DIR="$(mktemp -d)" WEBVIEW_TMP_DIR="$(mktemp -d)"
WEBVIEW_TMP_FILE="$WEBVIEW_TMP_DIR/chrome-android-zip" WEBVIEW_TMP_FILE="$WEBVIEW_TMP_DIR/chrome-android-zip"
curl -s -o "${WEBVIEW_TMP_FILE}" "https://storage.googleapis.com/chromium-browser-snapshots/Android/${CHROMIUM_ANDROID_REVISION}/chrome-android.zip" curl -s -o "${WEBVIEW_TMP_FILE}" "https://storage.googleapis.com/chromium-browser-snapshots/Android/${CHROMIUM_ANDROID_REVISION}/chrome-android.zip"