From e41b0b50b0e507c21d226195a557f131f699e583 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 9 Aug 2021 08:50:08 -0400
Subject: [PATCH] pythonPackages.txtorcon: run tests with trial and disable for
 <py3.5

---
 .../python-modules/txtorcon/default.nix         | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
index 08a316ece8c9..23fa4735ef70 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -1,4 +1,4 @@
-{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted
+{ lib, python, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, incremental, ipaddress, twisted
 , automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof
 , GeoIP, isPy27}:
 
@@ -18,21 +18,18 @@ buildPythonPackage rec {
     sha256 = "aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6";
   };
 
-  # zope.interface issue
-  doCheck = isPy3k;
-  # Skip a failing test until fixed upstream:
-  # https://github.com/meejah/txtorcon/issues/250
+  # Based on what txtorcon tox.ini will automatically test, allow back as far
+  # as Python 3.5.
+  disabled = pythonOlder "3.5";
+
   checkPhase = ''
-    pytest --ignore=test/test_util.py .
+    ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES ./test
   '';
 
   meta = {
     description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions";
     homepage = "https://github.com/meejah/txtorcon";
-    maintainers = with lib.maintainers; [ jluttine ];
-    # Currently broken on Python 2.7. See
-    # https://github.com/NixOS/nixpkgs/issues/71826
-    broken = isPy27;
+    maintainers = with lib.maintainers; [ jluttine exarkun ];
     license = lib.licenses.mit;
   };
 }