testautomation · pull · Dec 18, 2024 · Dec 18, 2024 · Dec 18, 2024 · Dec 18, 2024
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Code formatting.
+d2cdcfa9863e405983ecafc47e2e7e5af9da68f4
diff --git a/.github/workflows/acceptance_tests_cpython.yml b/.github/workflows/acceptance_tests_cpython.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - master
+      - v*-maintenance
     paths:
       - '.github/workflows/**'
       - 'src/**'
@@ -18,30 +19,26 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest', 'windows-latest' ]
-        python-version: [ '3.6', '3.7', '3.8', '3.9', 'pypy3' ]
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.10' ]
         include:
           - os: ubuntu-latest
             set_display: export DISPLAY=:99; Xvfb :99 -screen 0 1024x768x24 -ac -noreset & sleep 3
           - os: windows-latest
             set_codepage: chcp 850
-          - os: windows-latest
-            python-version: '3.9'
-            set_codepage: chcp 850
-            atest_args: --exclude require-lxml --exclude require-screenshot
         exclude:
           - os: windows-latest
-            python-version: 'pypy3'
+            python-version: 'pypy-3.10'
 
     runs-on: ${{ matrix.os }}
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup python for starting the tests
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v5.6.0
         with:
-          python-version: 3.6
+          python-version: '3.13'
           architecture: 'x64'
 
       - name: Get test starter Python at Windows
@@ -53,7 +50,7 @@ jobs:
         if: runner.os != 'Windows'
 
       - name: Setup python ${{ matrix.python-version }} for running the tests
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'
@@ -66,22 +63,16 @@ jobs:
         run: echo "BASE_PYTHON=$(which python)" >> $GITHUB_ENV
         if: runner.os != 'Windows'
 
-      - name: Install Report handling tools to Windows
-        run: |
-          choco install curl -y --no-progress
-          choco install zip -y --no-progress
-        if: runner.os == 'Windows'
-
       - name: Install Ubuntu PyPy dependencies
         run: |
           sudo apt-get update
           sudo apt-get -y -q install libxslt-dev libxml2-dev
         if: contains(matrix.python-version, 'pypy') && contains(matrix.os, 'ubuntu')
 
-      - name: Install screen and report handling tools, and other required libraries to Linux
+      - name: Install screen and other required libraries to Linux
         run: |
           sudo apt-get update
-          sudo apt-get -y -q install xvfb scrot zip curl libxml2-dev libxslt1-dev
+          sudo apt-get -y -q install xvfb scrot libxml2-dev libxslt1-dev
         if: contains(matrix.os, 'ubuntu')
 
       - name: Run acceptance tests
@@ -92,52 +83,45 @@ jobs:
           ${{ matrix.set_display }}
           ${{ env.ATEST_PYTHON }} atest/run.py --interpreter ${{ env.BASE_PYTHON }} --exclude no-ci ${{ matrix.atest_args }} atest/robot
 
-      - name: Delete output.xml (on Win)
-        run: |
-          Get-ChildItem atest/results -Include output.xml -Recurse | Remove-Item
-        if: always() && runner.os == 'Windows'
-
-      - name: Delete output.xml (on Unix-like)
-        run: |
-          find atest/results -type f -name 'output.xml' -exec rm {} +
-        if: always() && runner.os != 'Windows'
-
       - name: Archive acceptances test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: at-results-${{ matrix.python-version }}-${{ matrix.os }}
           path: atest/results
         if: always() && job.status == 'failure'
 
-      - name: Upload results on *nix
-        run: |
-          echo '<html><head><meta http-equiv = "refresh" content =" 0 ; url = /report.html"></head></html>' > atest/results/index.html
-          zip -r -j site.zip atest/results > no_output 2>&1
-          curl -s -H "Content-Type: application/zip" -H "Authorization: Bearer ${{ secrets.NETLIFY_TOKEN }}" --data-binary "@site.zip" https://api.netlify.com/api/v1/sites > response.json
-          echo "REPORT_URL=$(cat response.json|python -c "import sys, json; print('https://' + json.load(sys.stdin)['subdomain'] + '.netlify.com')")" >> $GITHUB_ENV
-          echo "JOB_STATUS=$(python -c "print('${{ job.status }}'.lower())")" >> $GITHUB_ENV
-        if: always() && job.status == 'failure' && runner.os != 'Windows'
-
-      - name: Upload results on Windows
-        run: |
-          echo '<html><head><meta http-equiv = "refresh" content =" 0 ; url = /report.html"></head></html>' > atest/results/index.html
-          zip -r -j site.zip atest/results > no_output 2>&1
-          curl -s -H "Content-Type: application/zip" -H "Authorization: Bearer ${{ secrets.NETLIFY_TOKEN }}" --data-binary "@site.zip" https://api.netlify.com/api/v1/sites > response.json
-          echo "REPORT_URL=$(cat response.json|python -c "import sys, json; print('https://' + json.load(sys.stdin)['subdomain'] + '.netlify.com')")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "JOB_STATUS=$(python -c "print('${{ job.status }}'.lower())")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        if: always() && job.status == 'failure' && runner.os == 'Windows'
-
-      - uses: octokit/request-action@971ad48f9c40ed001c41c2671b1e6e8e8165d5af
-        name: Update status with Github Status API
-        id: update_status
-        with:
-          route: POST /repos/:repository/statuses/:sha
-          repository: ${{ github.repository }}
-          sha: ${{ github.sha }}
-          state: "${{env.JOB_STATUS}}"
-          target_url: "${{env.REPORT_URL}}"
-          description: "Link to test report."
-          context: at-results-${{ matrix.python-version }}-${{ matrix.os }}
+      - name: Install and run rflogs
+        if: failure()
         env:
-          GITHUB_TOKEN: ${{ secrets.STATUS_UPLOAD_TOKEN }}
-        if: always() && job.status == 'failure'
+          RFLOGS_API_KEY: ${{ secrets.RFLOGS_API_KEY }}
+        working-directory: atest/results
+        shell: python
+        run: |
+          import os
+          import glob
+          import subprocess
+
+          # Install rflogs
+          subprocess.check_call(["pip", "install", "rflogs"])
+
+          # Find the first directory containing log.html
+          log_files = glob.glob("**/log.html", recursive=True)
+          if log_files:
+              result_dir = os.path.dirname(log_files[0])
+              print(f"Result directory: {result_dir}")
+
+              # Construct the rflogs command
+              cmd = [
+                  "rflogs", "upload",
+                  "--tag", f"workflow:${{ github.workflow }}",
+                  "--tag", f"os:${{ runner.os }}",
+                  "--tag", f"python-version:${{ matrix.python-version }}",
+                  "--tag", f"branch:${{ github.head_ref || github.ref_name }}",
+                  result_dir
+              ]
+
+              # Run rflogs upload
+              subprocess.check_call(cmd)
+          else:
+              print("No directory containing log.html found")
+              exit(1)
diff --git a/.github/workflows/acceptance_tests_cpython_pr.yml b/.github/workflows/acceptance_tests_cpython_pr.yml
@@ -1,4 +1,4 @@
-name: Acceptance tests (CPython + PyPy)
+name: Acceptance tests (CPython)
 
 on:
   pull_request:
@@ -15,32 +15,23 @@ jobs:
       fail-fast: true
       matrix:
         os: [ 'ubuntu-latest', 'windows-latest' ]
-        python-version: [ '3.6', '3.9' ]
+        python-version: [ '3.8', '3.13' ]
         include:
           - os: ubuntu-latest
             set_display: export DISPLAY=:99; Xvfb :99 -screen 0 1024x768x24 -ac -noreset & sleep 3
           - os: windows-latest
             set_codepage: chcp 850
-          - os: windows-latest
-            python-version: '3.9'
-            set_codepage: chcp 850
-            atest_args: --exclude require-lxml --exclude require-screenshot
-        exclude:
-          - os: windows-latest
-            python-version: 'pypy2'
-          - os: windows-latest
-            python-version: 'pypy3'
 
     runs-on: ${{ matrix.os }}
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup python for starting the tests
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v5.6.0
         with:
-          python-version: 3.6
+          python-version: '3.13'
           architecture: 'x64'
 
       - name: Get test starter Python at Windows
@@ -52,7 +43,7 @@ jobs:
         if: runner.os != 'Windows'
 
       - name: Setup python ${{ matrix.python-version }} for running the tests
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'
@@ -65,22 +56,10 @@ jobs:
         run: echo "BASE_PYTHON=$(which python)" >> $GITHUB_ENV
         if: runner.os != 'Windows'
 
-      - name: Install Report handling tools to Windows
-        run: |
-          choco install curl -y --no-progress
-          choco install zip -y --no-progress
-        if: runner.os == 'Windows'
-
-      - name: Install Ubuntu PyPy dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get -y -q install libxslt-dev libxml2-dev
-        if: contains(matrix.python-version, 'pypy') && contains(matrix.os, 'ubuntu')
-
-      - name: Install screen and report handling tools, and other required libraries to Linux
+      - name: Install screen and other required libraries to Linux
         run: |
           sudo apt-get update
-          sudo apt-get -y -q install xvfb scrot zip curl libxml2-dev libxslt1-dev
+          sudo apt-get -y -q install xvfb scrot libxml2-dev libxslt1-dev
         if: contains(matrix.os, 'ubuntu')
 
       - name: Run acceptance tests
@@ -91,52 +70,45 @@ jobs:
           ${{ matrix.set_display }}
           ${{ env.ATEST_PYTHON }} atest/run.py --interpreter ${{ env.BASE_PYTHON }} --exclude no-ci ${{ matrix.atest_args }} atest/robot
 
-      - name: Delete output.xml (on Win)
-        run: |
-          Get-ChildItem atest/results -Include output.xml -Recurse | Remove-Item
-        if: always() && runner.os == 'Windows'
-
-      - name: Delete output.xml (on Unix-like)
-        run: |
-          find atest/results -type f -name 'output.xml' -exec rm {} +
-        if: always() && runner.os != 'Windows'
-
       - name: Archive acceptances test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: at-results-${{ matrix.python-version }}-${{ matrix.os }}
           path: atest/results
         if: always() && job.status == 'failure'
 
-      - name: Upload results on *nix
-        run: |
-          echo '<html><head><meta http-equiv = "refresh" content =" 0 ; url = /report.html"></head></html>' > atest/results/index.html
-          zip -r -j site.zip atest/results > no_output 2>&1
-          curl -s -H "Content-Type: application/zip" -H "Authorization: Bearer ${{ secrets.NETLIFY_TOKEN }}" --data-binary "@site.zip" https://api.netlify.com/api/v1/sites > response.json
-          echo "REPORT_URL=$(cat response.json|python -c "import sys, json; print('https://' + json.load(sys.stdin)['subdomain'] + '.netlify.com')")" >> $GITHUB_ENV
-          echo "JOB_STATUS=$(python -c "print('${{ job.status }}'.lower())")" >> $GITHUB_ENV
-        if: always() && job.status == 'failure' && runner.os != 'Windows'
-
-      - name: Upload results on Windows
-        run: |
-          echo '<html><head><meta http-equiv = "refresh" content =" 0 ; url = /report.html"></head></html>' > atest/results/index.html
-          zip -r -j site.zip atest/results > no_output 2>&1
-          curl -s -H "Content-Type: application/zip" -H "Authorization: Bearer ${{ secrets.NETLIFY_TOKEN }}" --data-binary "@site.zip" https://api.netlify.com/api/v1/sites > response.json
-          echo "REPORT_URL=$(cat response.json|python -c "import sys, json; print('https://' + json.load(sys.stdin)['subdomain'] + '.netlify.com')")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "JOB_STATUS=$(python -c "print('${{ job.status }}'.lower())")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        if: always() && job.status == 'failure' && runner.os == 'Windows'
-
-      - uses: octokit/request-action@971ad48f9c40ed001c41c2671b1e6e8e8165d5af
-        name: Update status with Github Status API
-        id: update_status
-        with:
-          route: POST /repos/:repository/statuses/:sha
-          repository: ${{ github.repository }}
-          sha: ${{ github.sha }}
-          state: "${{env.JOB_STATUS}}"
-          target_url: "${{env.REPORT_URL}}"
-          description: "Link to test report."
-          context: at-results-${{ matrix.python-version }}-${{ matrix.os }}
+      - name: Install and run rflogs
+        if: failure()
         env:
-          GITHUB_TOKEN: ${{ secrets.STATUS_UPLOAD_TOKEN }}
-        if: always() && job.status == 'failure'
+          RFLOGS_API_KEY: ${{ secrets.RFLOGS_API_KEY }}
+        working-directory: atest/results
+        shell: python
+        run: |
+          import os
+          import glob
+          import subprocess
+
+          # Install rflogs
+          subprocess.check_call(["pip", "install", "rflogs"])
+
+          # Find the first directory containing log.html
+          log_files = glob.glob("**/log.html", recursive=True)
+          if log_files:
+              result_dir = os.path.dirname(log_files[0])
+              print(f"Result directory: {result_dir}")
+
+              # Construct the rflogs command
+              cmd = [
+                  "rflogs", "upload",
+                  "--tag", f"workflow:${{ github.workflow }}",
+                  "--tag", f"os:${{ runner.os }}",
+                  "--tag", f"python-version:${{ matrix.python-version }}",
+                  "--tag", f"branch:${{ github.head_ref || github.ref_name }}",
+                  result_dir
+              ]
+
+              # Run rflogs upload
+              subprocess.check_call(cmd)
+          else:
+              print("No directory containing log.html found")
+              exit(1)
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - master
+      - v*-maintenance
     paths:
       - '.github/workflows/**'
       - 'src/**'
@@ -19,35 +20,24 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest', 'windows-latest' ]
-        python-version: [ '3.6', '3.7', '3.8', '3.9', 'pypy3' ]
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.8' ]
         exclude:
           - os: windows-latest
-            python-version: 'pypy3'
+            python-version: 'pypy-3.8'
 
     runs-on: ${{ matrix.os }}
 
     name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v5.6.0
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'
 
-      - name: Run unit tests with coverage
+      - name: Run unit tests
         run: |
-          python -m pip install coverage
           python -m pip install -r utest/requirements.txt
-          python -m coverage run --branch utest/run.py -v
-
-      - name: Prepare HTML/XML coverage report
-        run: |
-          python -m coverage xml -i
-        if: always()
-
-      - uses: codecov/codecov-action@e3c560433a6cc60aec8812599b7844a7b4fa0d71
-        with:
-          name: ${{ matrix.python-version }}-${{ matrix.os }}
-        if: always()
+          python utest/run.py -v
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Code formatting.
		d2cdcfa9863e405983ecafc47e2e7e5af9da68f4