You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
66 lines
2.4 KiB
66 lines
2.4 KiB
5 years ago
|
From 781a25512b107828aff71998c19f2fa4dbf471c1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Sergey G. Brester" <serg.brester@sebres.de>
|
||
|
|
Date: Fri, 6 Mar 2020 19:04:39 +0100
|
||
|
|
Subject: [PATCH 1/4] travis CI: add 3.9-dev as target
|
||
|
|
|
||
|
|
---
|
||
|
|
.travis.yml | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
--- a/fail2ban/server/jailthread.py
|
||
|
|
+++ b/fail2ban/server/jailthread.py
|
||
|
|
@@ -120,3 +120,6 @@ class JailThread(Thread):
|
||
|
|
## python 2.x replace binding of private __bootstrap method:
|
||
|
|
if sys.version_info < (3,): # pragma: 3.x no cover
|
||
|
|
JailThread._Thread__bootstrap = JailThread._JailThread__bootstrap
|
||
|
|
+## python 3.9, restore isAlive method:
|
||
|
|
+elif not hasattr(JailThread, 'isAlive'): # pragma: 2.x no cover
|
||
|
|
+ JailThread.isAlive = JailThread.is_alive
|
||
|
|
--- a/fail2ban/tests/sockettestcase.py
|
||
|
|
+++ b/fail2ban/tests/sockettestcase.py
|
||
|
|
@@ -87,7 +87,7 @@ class Socket(LogCaptureTestCase):
|
||
|
|
def _stopServerThread(self):
|
||
|
|
serverThread = self.serverThread
|
||
|
|
# wait for end of thread :
|
||
|
|
- Utils.wait_for(lambda: not serverThread.isAlive()
|
||
|
|
+ Utils.wait_for(lambda: not serverThread.is_alive()
|
||
|
|
or serverThread.join(Utils.DEFAULT_SLEEP_TIME), unittest.F2B.maxWaitTime(10))
|
||
|
|
self.serverThread = None
|
||
|
|
|
||
|
|
@@ -98,7 +98,7 @@ class Socket(LogCaptureTestCase):
|
||
|
|
self.server.close()
|
||
|
|
# wait for end of thread :
|
||
|
|
self._stopServerThread()
|
||
|
|
- self.assertFalse(serverThread.isAlive())
|
||
|
|
+ self.assertFalse(serverThread.is_alive())
|
||
|
|
# clean :
|
||
|
|
self.server.stop()
|
||
|
|
self.assertFalse(self.server.isActive())
|
||
|
|
@@ -139,7 +139,7 @@ class Socket(LogCaptureTestCase):
|
||
|
|
self.server.stop()
|
||
|
|
# wait for end of thread :
|
||
|
|
self._stopServerThread()
|
||
|
|
- self.assertFalse(serverThread.isAlive())
|
||
|
|
+ self.assertFalse(serverThread.is_alive())
|
||
|
|
self.assertFalse(self.server.isActive())
|
||
|
|
self.assertFalse(os.path.exists(self.sock_name))
|
||
|
|
|
||
|
|
@@ -180,7 +180,7 @@ class Socket(LogCaptureTestCase):
|
||
|
|
self.server.stop()
|
||
|
|
# wait for end of thread :
|
||
|
|
self._stopServerThread()
|
||
|
|
- self.assertFalse(serverThread.isAlive())
|
||
|
|
+ self.assertFalse(serverThread.is_alive())
|
||
|
|
|
||
|
|
def testLoopErrors(self):
|
||
|
|
# replace poll handler to produce error in loop-cycle:
|
||
|
|
@@ -216,7 +216,7 @@ class Socket(LogCaptureTestCase):
|
||
|
|
self.server.stop()
|
||
|
|
# wait for end of thread :
|
||
|
|
self._stopServerThread()
|
||
|
|
- self.assertFalse(serverThread.isAlive())
|
||
|
|
+ self.assertFalse(serverThread.is_alive())
|
||
|
|
self.assertFalse(self.server.isActive())
|
||
|
|
self.assertFalse(os.path.exists(self.sock_name))
|
||
|
|
|