diff --git a/.github/workflows/linux_manual.yml b/.github/workflows/linux_manual.yml index 55afc45..1b79f0c 100644 --- a/.github/workflows/linux_manual.yml +++ b/.github/workflows/linux_manual.yml @@ -38,7 +38,7 @@ jobs: uses: actions/checkout@v4 - name: Setup firefox id: setup-firefox - uses: ./.github/actions/setup_firefox/ + uses: browser-actions/setup-firefox@v1 with: firefox-version: ${{ matrix.firefox }} - run: | @@ -50,11 +50,12 @@ jobs: - name: Setup tests shell: bash run: ./setup_script.sh + - name: Create SSL Certificate Files + run: | + openssl req -x509 -newkey rsa:2048 -keyout search_files/server.key -out search_files/server.cert -days 365 -nodes -subj "/CN=localhost" - name: Run Tests - run: tox -e bdd-tests -- --experiment-branch ${{ matrix.branch }} --experiment-slug ${{ inputs.slug }} --private-browsing-enabled --firefox-path="/opt/hostedtoolcache/firefox/${{ matrix.firefox }}/x64/firefox" ${{ inputs.extra-arguments }} - env: - SSL_CERT: ${{ secrets.SSL_CERT }} - SSL_KEY: ${{ secrets.SSL_KEY }} + run: | + tox -e bdd-tests -- --experiment-branch ${{ matrix.branch }} --experiment-slug ${{ inputs.slug }} --private-browsing-enabled --firefox-path="/opt/hostedtoolcache/firefox/${{ matrix.firefox }}/x64/firefox" ${{ inputs.extra-arguments }} - uses: actions/upload-artifact@v4 if: ${{ always() }} with: diff --git a/.github/workflows/windows_manual.yml b/.github/workflows/windows_manual.yml index dcfa90f..31e4db3 100644 --- a/.github/workflows/windows_manual.yml +++ b/.github/workflows/windows_manual.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v4 - name: Setup firefox id: setup-firefox - uses: ./.github/actions/setup_firefox/ + uses: browser-actions/setup-firefox@v1 with: firefox-version: ${{ matrix.firefox }} - run: | @@ -47,7 +47,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.12' - name: Install Dependencies shell: pwsh run: choco install jdk8 selenium @@ -68,11 +68,12 @@ jobs: - name: Setup tests shell: bash run: ./setup_script.sh + - name: Create SSL Certificate Files (Windows) + shell: bash + run: | + openssl req -x509 -newkey rsa:2048 -keyout search_files/server.key -out search_files/server.cert -days 365 -nodes -subj "//CN=localhost" - name: Run Tests run: tox -e bdd-tests -- --experiment-branch ${{ matrix.branch }} --experiment-slug ${{ inputs.slug }} --private-browsing-enabled --firefox-path="C:\Program Files\Firefox_${{ matrix.firefox }}\firefox.exe" ${{ inputs.extra-arguments }} - env: - SSL_CERT: ${{ secrets.SSL_CERT }} - SSL_KEY: ${{ secrets.SSL_KEY }} - uses: actions/upload-artifact@v4 if: ${{ always() }} with: diff --git a/search_server/search_server.py b/search_server/search_server.py index 3358bb4..0b7d246 100644 --- a/search_server/search_server.py +++ b/search_server/search_server.py @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. from http.server import HTTPServer, SimpleHTTPRequestHandler -import os import ssl