Make tests really use auth since secrets have been added, fix some in…

…dents
miurahr · Feb 1, 2025 · 409cb4b · 409cb4b
1 parent f113ce3
commit 409cb4b
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 45 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -3,52 +3,52 @@ name: Check tox tests
 on:
   push:
     branches:
-      - master
-      - releases/*
+    - master
+    - releases/*
   pull_request:
     types:
-      - opened
-      - synchronize
-      - reopened
+    - opened
+    - synchronize
+    - reopened
 
 jobs:
   check_document:
     name: Check packaging 📦
     runs-on: ubuntu-22.04
     env:
-      AQT_TEST_EMAIL: ${{ secrets.TEST_EMAIL }}
-      AQT_TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
+      AQT_TEST_EMAIL: ${{ secrets.AQT_TEST_EMAIL }}
+      AQT_TEST_PASSWORD: ${{ secrets.AQT_TEST_PASSWORD }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 20
-          fetch-tags: true
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-      - name: Install tools
-        run: |
-          pip install -U pip
-          pip install tox tox-gh-actions coveralls coverage[toml]
-      - name: Test
-        run: |
-          tox
-          coverage xml -o cobertura.xml
-        env:
-          PYTEST_ADDOPTS: --cov-config=pyproject.toml --cov --cov-append --verbose
-      - name: Upload Coverage
-        run: coveralls --service=github
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/setup-java@v4
-        if: ( github.event_name == 'push' ) && ( github.ref == 'refs/heads/master' )
-        with:
-          distribution: 'temurin'
-          java-version: '21'
-      - name: Send coverage to codacy
-        if: ( github.event_name == 'push' ) && ( github.ref == 'refs/heads/master' )
-        run: |
-          java -jar ci/codacy-coverage-reporter.jar report -l Python -t ${PROJECT_TOKEN} -r cobertura.xml
-        env:
-          PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 20
+        fetch-tags: true
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+    - name: Install tools
+      run: |
+        pip install -U pip
+        pip install tox tox-gh-actions coveralls coverage[toml]
+    - name: Test
+      run: |
+        tox
+        coverage xml -o cobertura.xml
+      env:
+        PYTEST_ADDOPTS: --cov-config=pyproject.toml --cov --cov-append --verbose
+    - name: Upload Coverage
+      run: coveralls --service=github
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - uses: actions/setup-java@v4
+      if: ( github.event_name == 'push' ) && ( github.ref == 'refs/heads/master' )
+      with:
+        distribution: 'temurin'
+        java-version: '21'
+    - name: Send coverage to codacy
+      if: ( github.event_name == 'push' ) && ( github.ref == 'refs/heads/master' )
+      run: |
+        java -jar ci/codacy-coverage-reporter.jar report -l Python -t ${PROJECT_TOKEN} -r cobertura.xml
+      env:
+        PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
diff --git a/ci/steps.yml b/ci/steps.yml
@@ -1,6 +1,6 @@
 env:
-  AQT_TEST_EMAIL: ${{ secrets.TEST_EMAIL }}
-  AQT_TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
+  AQT_TEST_EMAIL: ${{ secrets.AQT_TEST_EMAIL }}
+  AQT_TEST_PASSWORD: ${{ secrets.AQT_TEST_PASSWORD }}
 steps:
 - task: UsePythonVersion@0
   inputs:
@@ -132,7 +132,7 @@ steps:
       $(CHECK_OUTPUT_CMD)
     fi
     if [[ "$(SUBCOMMAND)" =~ ^install-(doc|example)$ ]]; then
-      opt=""
+      opt="" 
       if [[ "$(MODULE)" != "" ]]; then
         opt+=" -m $(MODULE)"
       fi

diff --git a/tests/test_commercial.py b/tests/test_commercial.py
@@ -373,7 +373,7 @@ def modify_qt_config(content):
                 TEST_PASSWORD,
                 "6.8.1",
             ],
-            "Downloading",
+            "INFO    : [0] Arguments",
         ),
         (
             [
@@ -386,7 +386,7 @@ def modify_qt_config(content):
                 "--pw",
                 TEST_PASSWORD,
             ],
-            "installing",
+            "INFO    : Qt installation completed successfully",
         ),
     ],
 )