From b2005ecd78df1fc1a2c05df344b9f39526c5f291 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Sun, 19 Nov 2023 21:13:42 +0000
Subject: [PATCH] [Tests] Fix console tests stalling by pinning pytest to 7.4.2

Tests were stalling in deluge_ui_entry with pytest 7.4.3 likely due to
changes in the way it handles stderr but it is not clean the extact
issue.

For now we will pin the pytest version and look to fix the issue later.

Reference: https://docs.pytest.org/en/stable/changelog.html#pytest-7-4-3-2023-10-24
---
 .github/workflows/ci.yml | 4 ++--
 pyproject.toml           | 7 +++----
 requirements-ci.txt      | 4 ++++
 requirements-tests.txt   | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 requirements-ci.txt

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6fc6b5b729..1f0675c2c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install --upgrade pip wheel setuptools
-          pip install -r requirements.txt -r requirements-tests.txt
+          pip install -r requirements-ci.txt
           pip install -e .
 
       - name: Install security dependencies
@@ -92,7 +92,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install --upgrade pip wheel setuptools
-          pip install -r requirements.txt -r requirements-tests.txt
+          pip install -r requirements-ci.txt
           pip install -e .
 
       - name: Test with pytest
diff --git a/pyproject.toml b/pyproject.toml
index 0449619d61..169561f131 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,8 +1,5 @@
 [build-system]
-requires = [
-    "setuptools",
-    "wheel",
-]
+requires = ["setuptools", "wheel"]
 
 [tool.black]
 skip-string-normalization = true
@@ -11,6 +8,8 @@ skip-string-normalization = true
 profile = "black"
 
 [tool.pytest.ini_options]
+# Dump tracebacks if a test takes longer than X seconds
+faulthandler_timeout = 60
 # Hide logged warnings and errors in test output.
 log_cli_level = "CRITICAL"
 addopts = "--basetemp=_pytest_temp"
diff --git a/requirements-ci.txt b/requirements-ci.txt
new file mode 100644
index 0000000000..0ebcd6077f
--- /dev/null
+++ b/requirements-ci.txt
@@ -0,0 +1,4 @@
+-r requirements.txt
+-r requirements-tests.txt
+libtorrent==2.0.7
+pytest==7.4.2
diff --git a/requirements-tests.txt b/requirements-tests.txt
index 7796f36e7a..a570108adb 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -1,4 +1,4 @@
-libtorrent==2.0.7
+libtorrent
 pytest
 pytest-twisted
 pytest-cov