Merge pull request #382 from meejah/381.python312

make tests more-specific
meejah · Jun 1, 2023 · e50efcb · e50efcb
2 parents 8aa5e02 + c6371c1
commit e50efcb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/docs/releases.rst b/docs/releases.rst
@@ -17,6 +17,7 @@ See also :ref:`api_stability`.
 
 `git main <https://github.com/meejah/txtorcon>`_ *will likely become v23.6.0*
 
+ * Fix test-failures on Python 3.12
 
 
 v23.5.0

diff --git a/test/test_torstate.py b/test/test_torstate.py
@@ -1293,7 +1293,14 @@ def __init__(self, i):
         self.assertEqual(self.transport.value(), b'EXTENDCIRCUIT 0 0000000000000000000000000000000000000000,0000000000000000000000000000000000000001,0000000000000000000000000000000000000002\r\n')
         # should have gotten a warning about this not being an entry
         # guard
-        self.assertEqual(len(self.flushWarnings()), 1)
+        self.assertEqual(
+            1,
+            len([
+                warn
+                for warn in self.flushWarnings()
+                if "Circuit doesn't start with a guard" in warn["message"]
+            ])
+        )
 
     def test_build_circuit_no_routers(self):
         self.state.build_circuit()
@@ -1329,7 +1336,14 @@ def __init__(self, i):
         self.send(b"250 EXTENDED 1234")
         # should have gotten a warning about this not being an entry
         # guard
-        self.assertEqual(len(self.flushWarnings()), 1)
+        self.assertEqual(
+            1,
+            len([
+                warn
+                for warn in self.flushWarnings()
+                if "Circuit doesn't start with a guard" in warn["message"]
+            ])
+        )
         return d
 
     def test_build_circuit_error(self):
@@ -1477,7 +1491,14 @@ def __init__(self, i):
         self.state.circuits[1234].update(['1234', 'BUILT'])
         # should have gotten a warning about this not being an entry
         # guard
-        self.assertEqual(len(self.flushWarnings()), 1)
+        self.assertEqual(
+            1,
+            len([
+                warn
+                for warn in self.flushWarnings()
+                if "Circuit doesn't start with a guard" in warn["message"]
+            ])
+        )
         return d
 
     def test_build_circuit_failure(self):