WT-1273 remove Selenium tests

Author: wen-2018

.github/workflows/cdn_tests.yml

@@ -54,14 +54,10 @@ jobs:
             MARK_EXPRESSION: "cdnssl"
     env:
       BASE_URL: ${{ github.event.inputs.mozorg_service_hostname || 'https://www.mozilla.org' }} # Mozorg base URL
-      BROWSER_NAME: ""
       CI_JOB_ID: ${{ github.run_id }}
-      DRIVER: ""
       LABEL: ${{ matrix.LABEL }}
       MARK_EXPRESSION: ${{ matrix.MARK_EXPRESSION }}
       PYTEST_PROCESSES: 1
-      SAUCELABS_API_KEY: ""
-      SAUCELABS_USERNAME: ""
       RERUNS_ALLOWED: 3
       RERUNS_DELAY_SECS: 60
 

.github/workflows/download_tests.yml

@@ -36,14 +36,10 @@ jobs:
     needs: notify-of-test-run-start
     env:
       BASE_URL: ${{ github.event.inputs.mozorg_service_hostname || 'https://www.mozilla.org' }} # Mozorg base URL
-      BROWSER_NAME: ""
       CI_JOB_ID: ${{ github.run_id }}
-      DRIVER: ""
       LABEL: test-downloads
       MARK_EXPRESSION: download
       PYTEST_PROCESSES: auto
-      SAUCELABS_API_KEY: ""
-      SAUCELABS_USERNAME: ""
 
     # Note we use if: always() below to keep things going, rather than
     # continue-on-error, because that approach falsely marks the overall

.github/workflows/integration_tests.yml

@@ -43,30 +43,11 @@ jobs:
   integration-tests:
     if: github.repository == 'mozilla/bedrock'
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - LABEL: test-ie-saucelabs
-            BROWSER_NAME: internet explorer
-            DRIVER: SauceLabs
-            MARK_EXPRESSION: smoke
-            PLATFORM: Windows 10
-            PYTEST_PROCESSES: 8
-          - LABEL: test-headless
-            DRIVER: ""
-            MARK_EXPRESSION: headless
-
     env:
       BASE_URL: ${{ github.event.inputs.mozorg_service_hostname }}
-      BROWSER_NAME: ${{ matrix.BROWSER_NAME }}
       CI_JOB_ID: ${{ github.run_id }}
-      DRIVER: ${{ matrix.DRIVER }}
-      LABEL: ${{ matrix.LABEL }}
-      MARK_EXPRESSION: ${{ matrix.MARK_EXPRESSION }}
-      PLATFORM: ${{ matrix.PLATFORM }}
-      PYTEST_PROCESSES: ${{ matrix.PYTEST_PROCESSES }}
-      SAUCELABS_API_KEY: ${{ secrets.SAUCELABS_API_KEY }}
-      SAUCELABS_USERNAME: ${{ secrets.SAUCELABS_USERNAME }}
+      LABEL: test-headless
+      MARK_EXPRESSION: headless
 
     # Note we use if: always() below to keep things going, rather than
     # continue-on-error, because that approach falsely marks the overall
@@ -96,7 +77,7 @@ jobs:
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
         with:
           name: test-results
-          path: results-${{github.run_id}}-${{matrix.label}}
+          path: results-${{github.run_id}}
           if-no-files-found: ignore  # this avoids a false "Warning" if there were no issues
 
   playwright-tests:

bin/integration_tests/cleanup_after_functional_tests.sh

@@ -16,10 +16,3 @@ docker cp "bedrock-${CI_JOB_ID}:/app/tests/results" "results-${CI_JOB_ID}"
 
 # Now that we copied artifact, remove container.
 docker rm "bedrock-${CI_JOB_ID}"
-
-if [ "${DRIVER}" = "Remote" ]; then
-    docker compose \
-        -f ./bin/integration_tests/docker_compose_for_integration_tests.yml \
-        -p "selenium-hub-${CI_JOB_ID}" \
-        down --remove-orphans
-fi

bin/integration_tests/docker_compose_for_integration_tests.yml

@@ -5,66 +5,20 @@
 
 set -euo pipefail
 
-# reduce parallelism to try to make test runners more efficient
-#NUM_CPUS=$(grep -c ^processor /proc/cpuinfo)
-NUM_CPUS=1
-# Number of CPUs + 1 to have a hot spare.
-NUM_BROWSER_NODES=$(( NUM_CPUS + 1 ))
-
 if [ -z "${BASE_URL:-}" ];
 then
     echo "No BASE_URL set, exiting"
     exit 0;
 fi
 
-if [ "${DRIVER}" = "Remote" ]; then
-    docker compose \
-        -f ./bin/integration_tests/docker_compose_for_integration_tests.yml \
-        -p "selenium-hub-${CI_JOB_ID}" \
-        up -d selenium-hub
-
-    docker compose \
-        -f ./bin/integration_tests/docker_compose_for_integration_tests.yml \
-        -p "selenium-hub-${CI_JOB_ID}" \
-        up -d --scale ${BROWSER_NAME}=${NUM_BROWSER_NODES} ${BROWSER_NAME}
-
-    SELENIUM_HOST="grid"
-    SELENIUM_PORT=4444
-    DOCKER_LINKS=(--link selenium-hub-${CI_JOB_ID}-selenium-hub-1:grid --net selenium-hub-${CI_JOB_ID}_default)
-
-
-    echo -n "Waiting for Selenium Grid to get ready..."
-    IP=$(docker inspect selenium-hub-${CI_JOB_ID}-selenium-hub-1 | jq -r .[0].NetworkSettings.Networks[].IPAddress)
-    set +e
-    SELENIUM_READY=$((curl -fs  http://${IP}:4444/wd/hub/status  | jq -es 'if . == [] then null else .[] | .value.ready end' > /dev/null) || echo "false")
-    while ! ${SELENIUM_READY}; do
-        echo -n "."
-        SELENIUM_READY=$((curl -fs  http://${IP}:4444/wd/hub/status  | jq -es 'if . == [] then null else .[] | .value.ready end' > /dev/null) || echo "false")
-        sleep 1s;
-    done
-    set -e
-    echo " done"
-fi
-
 docker pull ${TEST_IMAGE}
 
 docker run \
     --name "bedrock-${CI_JOB_ID}" \
-    ${DOCKER_LINKS[@]} \
-    -e "DRIVER=${DRIVER}" \
-    -e "SAUCELABS_USERNAME=${SAUCELABS_USERNAME}" \
-    -e "SAUCELABS_API_KEY=${SAUCELABS_API_KEY}" \
-    -e "SELENIUM_HOST=${SELENIUM_HOST:-}" \
-    -e "SELENIUM_PORT=${SELENIUM_PORT:-}" \
-    -e "BROWSER_NAME=${BROWSER_NAME:-}" \
-    -e "BROWSER_VERSION=${BROWSER_VERSION:-}" \
-    -e "PLATFORM=${PLATFORM:-}" \
     -e "MARK_EXPRESSION=${MARK_EXPRESSION:-}" \
     -e "BASE_URL=${BASE_URL:-}" \
     -e "PYTEST_PROCESSES=${PYTEST_PROCESSES:=4}" \
     -e "BOUNCER_URL=${BOUNCER_URL:=https://download.mozilla.org/}" \
-    -e "SCREEN_WIDTH=1600" \
-    -e "SCREEN_HEIGHT=1200" \
     -e "RERUNS_ALLOWED=${RERUNS_ALLOWED:=2}" \
     -e "RERUNS_DELAY_SECS=${RERUNS_DELAY_SECS:=1}" \
     ${TEST_IMAGE} bin/integration_tests/run_integration_tests.sh

bin/integration_tests/functional_tests.sh

@@ -9,22 +9,12 @@ set -xe
 : ${PYTEST_PROCESSES:="1"}
 : ${BASE_URL:="https://www-dev.allizom.org"}
 : ${BOUNCER_URL:="https://download.mozilla.org/"}
-: ${SELENIUM_HOST:="localhost"}
-: ${SELENIUM_PORT:="4444"}
-: ${BROWSER_NAME:="firefox"}
 : ${TESTS_PATH:="tests"}
 : ${RESULTS_PATH:="${TESTS_PATH}/results"}
 : ${RERUNS_ALLOWED:="2"}
 : ${RERUNS_DELAY_SECS:="1"}
 
-# Common arguments
-if [ "${DRIVER}" = "SauceLabs" ]; then
-  # Temporarily exclude logs for Saucelabs jobs https://github.com/pytest-dev/pytest-selenium/issues/288
-  CMD="SAUCELABS_W3C=true SELENIUM_EXCLUDE_DEBUG=logs pytest"
-else
-  CMD="pytest"
-fi
-
+CMD="pytest"
 CMD="${CMD} -r a"
 CMD="${CMD} --verbose"
 CMD="${CMD} --workers ${PYTEST_PROCESSES}"
@@ -33,27 +23,6 @@ CMD="${CMD} --reruns ${RERUNS_ALLOWED}"
 CMD="${CMD} --reruns-delay ${RERUNS_DELAY_SECS}"
 CMD="${CMD} --html ${RESULTS_PATH}/index.html"
 CMD="${CMD} --junitxml ${RESULTS_PATH}/junit.xml"
-if [ -n "${DRIVER}" ]; then CMD="${CMD} --driver ${DRIVER}"; fi
-
-# Remote arguments
-if [ "${DRIVER}" = "Remote" ]; then
-  CMD="${CMD} --selenium-host ${SELENIUM_HOST}"
-  CMD="${CMD} --selenium-port ${SELENIUM_PORT}"
-  CMD="${CMD} --capability browserName \"${BROWSER_NAME}\""
-  if [ -n "${BROWSER_VERSION}" ]; then CMD="${CMD} --capability browserVersion \"${BROWSER_VERSION}\""; fi
-  if [ -n "${PLATFORM}" ]; then CMD="${CMD} --capability platformName \"${PLATFORM}\""; fi
-fi
-
-# Sauce Labs arguments
-if [ "${DRIVER}" = "SauceLabs" ]; then
-  CMD="${CMD} --capability browserName \"${BROWSER_NAME}\""
-  if [ -n "${BROWSER_VERSION}" ]; then CMD="${CMD} --capability browserVersion \"${BROWSER_VERSION}\""; fi
-  if [ -n "${PLATFORM}" ]; then CMD="${CMD} --capability platformName \"${PLATFORM}\""; fi
-  if [ -n "${SELENIUM_VERSION}" ]; then CMD="${CMD} --capability selenium-version \"${SELENIUM_VERSION}\""; fi
-  if [ -n "${BUILD_TAG}" ]; then CMD="${CMD} --capability build \"${BUILD_TAG}\""; fi
-  if [ -n "${SCREEN_RESOLUTION}" ]; then CMD="${CMD} --capability screenResolution \"${SCREEN_RESOLUTION}\""; fi
-  if [ -n "${PRIVACY}" ]; then CMD="${CMD} --capability public \"${PRIVACY}\""; fi
-fi
 
 if [ -n "${MARK_EXPRESSION}" ]; then CMD="${CMD} -m \"${MARK_EXPRESSION}\""; fi
 

bin/integration_tests/run_integration_tests.sh

@@ -6,19 +6,17 @@ factory-boy==3.3.3
 freezegun==1.5.5
 markdown-it-py>=4.2.0
 py==1.11.0
-PyPOM==2.2.4
 pyquery==2.0.1
-pytest==9.0.3  # Included because we use it directly, but also a subdep of pytest-selenium's subdeps
+pytest==9.0.3
+pytest-base-url==2.1.0  # Provides the --base-url option and base_url fixture used by our HTTP integration tests
 pytest-cov==7.1.0
 pytest-datadir==1.8.0
 pytest-django==4.12.0
 pytest-mock==3.15.1
 pytest-parallel==0.1.1
 pytest-rerunfailures==16.1
-pytest-selenium==4.1.0
 responses==0.26.0
 ruff==0.15.12
-selenium==4.43.0
 translate-toolkit==3.19.8
 uv==0.11.15
 wagtail-factories==4.4.0