TMP TEST

tdesveaux · Nov 2, 2024 · b6f4e3a · b6f4e3a
1 parent 0ac01e7
commit b6f4e3a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,14 +9,18 @@ permissions:
   contents: read
 
 jobs:
-  win:
-    name: Win / python ${{ matrix.python-version }}
-    runs-on: windows-2019
+  ci:
+    name: ${{ matrix.runs-version }} / python ${{ matrix.python-version }}
+    runs-on: ${{ matrix.runs-version }}
 
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.12"]
+        runs-version:
+          - ubuntu-latest
+          - windows-2019
+          - windows-2022
 
     env:
       # Needed to ignore specific warns, otherwise, it'll warn a generic message
@@ -44,48 +48,13 @@ jobs:
           python -m pip install -r requirements-pip.txt
           python -m pip install -r requirements-ci.txt
           python -m pip list
-          # Check that pywin32 is properly installed
-          python -c "import win32api"
-
-      - name: "Run tests for ${{ matrix.python-version }}"
-        run: "python -m twisted.trial --reporter=text --rterrors --exitfirst buildbot.test buildbot_worker.test"
-        timeout-minutes: 30
-
-  linux:
-    name: Linux / python ${{ matrix.python-version }}
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-
-    env:
-      # Needed to ignore specific warns, otherwise, it'll warn a generic message
-      SQLALCHEMY_WARN_20: 1
 
-    steps:
-      - uses: "actions/checkout@v4"
-      - uses: "actions/setup-python@v5"
-        with:
-          python-version: "${{ matrix.python-version }}"
-          cache: 'pip'
-          cache-dependency-path: |
-            requirements-ci.txt
-            requirements-cidb.txt
-            master/setup.py
-            worker/setup.py
-            pkg/setup.py
-      - name: "Install dependencies"
+      - name: "Check win32api"
+        if: ${{ matrix.runs-version != 'ubuntu-latest' }}
         run: |
-          python -c "import sys; print(sys.prefix)"
-          python -c "import sys; print(sys.exec_prefix)"
-          python -c "import sys; print(sys.executable)"
-          python -V -V
-          python -m pip install -U pip setuptools wheel
-          python -m pip install -r requirements-ci.txt
-          python -m pip list
+          # Check that pywin32 is properly installed
+          python -c "import win32api"
 
       - name: "Run tests for ${{ matrix.python-version }}"
-        run: "python -m twisted.trial --reporter=text --rterrors --exitfirst buildbot.test buildbot_worker.test"
+        run: "python -m twisted.trial --reporter=text --rterrors --exitfirst buildbot.test.integration.test_steps_configurable.BuildbotTestCiTest.test_buildbot_ci"
         timeout-minutes: 30
diff --git a/.github/workflows/cidb.yml b/.github/workflows/cidb.yml
@@ -2,7 +2,7 @@ name: CI (DB)
 on:
   push:
     branches:
-    - fake_master
+    # - fake_master
     - release
 
 permissions:

diff --git a/master/buildbot/db/logs.py b/master/buildbot/db/logs.py
@@ -871,6 +871,7 @@ def _put_close(res: None | Failure) -> None | Failure:
         assert not isinstance(item, _CloseObj)
         with condition:
             condition.notify()
+        print(f"{item=!r} ({type(item)})", flush=True)
         yield item
 
     assert worker_task.called