From 34f737e3f7afca88502bd677b672bb301cea5966 Mon Sep 17 00:00:00 2001 From: vadim Date: Thu, 13 Jun 2024 12:59:59 +0700 Subject: [PATCH 1/3] Update entrypoint.sh --- selenium/android/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selenium/android/entrypoint.sh b/selenium/android/entrypoint.sh index 3081d6110..6a132a66e 100755 --- a/selenium/android/entrypoint.sh +++ b/selenium/android/entrypoint.sh @@ -70,17 +70,17 @@ fi while [ "$(adb shell getprop sys.boot_completed | tr -d '\r')" != "1" ] && [ -z "$STOP" ] ; do sleep 1; done if [ -n "$STOP" ]; then exit 0; fi -DEFAULT_CAPABILITIES='"appium:androidNaturalOrientation": true, "appium:deviceName": "android", "platformName": "Android", "appium:automationName": "UiAutomator2", "appium:noReset": true, "appium:udid": "'$EMULATOR'", "appium:systemPort": '$BOOTSTRAP_PORT', "appium:newCommandTimeout": 90' +DEFAULT_CAPABILITIES='"appium:androidNaturalOrientation": true, "appium:deviceName": "Android Emulator", "platformName": "Android", "appium:automationName": "UiAutomator2", "appium:noReset": true, "appium:udid": "'$EMULATOR'", "appium:systemPort": '$BOOTSTRAP_PORT', "appium:newCommandTimeout": 90' if [ -n "@CHROME_MOBILE@" ]; then while ip addr | grep inet | grep -q tentative > /dev/null; do sleep 0.1; done - DEFAULT_CAPABILITIES=$DEFAULT_CAPABILITIES', "chromedriverPort": '$CHROMEDRIVER_PORT + DEFAULT_CAPABILITIES=$DEFAULT_CAPABILITIES', "appium:chromedriverPort": '$CHROMEDRIVER_PORT /usr/bin/devtools --android & DEVTOOLS_PID=$! fi if [ -x "/usr/bin/chromedriver" ]; then - DEFAULT_CAPABILITIES=$DEFAULT_CAPABILITIES',"chromedriverExecutable": "/usr/bin/chromedriver"' + DEFAULT_CAPABILITIES=$DEFAULT_CAPABILITIES',"appium:chromedriverExecutable": "/usr/bin/chromedriver"' fi /opt/node_modules/.bin/appium -a 0.0.0.0 -p "$PORT" --log-timestamp --log-no-colors ${APPIUM_ARGS} --base-path "/wd/hub" --default-capabilities "{$DEFAULT_CAPABILITIES}" & From 8dfab3d170d899db19af492630023bfe3e4fe63d Mon Sep 17 00:00:00 2001 From: vadim Date: Thu, 13 Jun 2024 13:02:55 +0700 Subject: [PATCH 2/3] Update automate_android.sh --- selenium/automate_android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selenium/automate_android.sh b/selenium/automate_android.sh index bfd36a639..7ad120cb1 100755 --- a/selenium/automate_android.sh +++ b/selenium/automate_android.sh @@ -129,7 +129,7 @@ validate_android_abi(){ download_chromedriver() { pushd "$TMP_DIR" - wget -O chromedriver.zip http://chromedriver.storage.googleapis.com/$1/chromedriver_linux64.zip + wget -O chromedriver.zip https://chromedriver.storage.googleapis.com/$1/chromedriver_linux64.zip unzip chromedriver.zip rm chromedriver.zip popd From 79ce203eafd680ced5bbb0804e610f43071fdc5b Mon Sep 17 00:00:00 2001 From: Vadim Date: Thu, 13 Jun 2024 16:32:07 +0700 Subject: [PATCH 3/3] Update automate_android.sh --- selenium/automate_android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selenium/automate_android.sh b/selenium/automate_android.sh index 7ad120cb1..bfd36a639 100755 --- a/selenium/automate_android.sh +++ b/selenium/automate_android.sh @@ -129,7 +129,7 @@ validate_android_abi(){ download_chromedriver() { pushd "$TMP_DIR" - wget -O chromedriver.zip https://chromedriver.storage.googleapis.com/$1/chromedriver_linux64.zip + wget -O chromedriver.zip http://chromedriver.storage.googleapis.com/$1/chromedriver_linux64.zip unzip chromedriver.zip rm chromedriver.zip popd