diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2022-04-25 10:56:40 -0400 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2022-04-25 10:56:40 -0400 |
| commit | 5540514928474956c25936ab48f7fa0b59755bb1 (patch) | |
| tree | d8927adc8594faa6b0571ba270a3e3dbc1234dae /tests | |
| parent | 47529be4385cffba6851f10e505f5683290d116e (diff) | |
| parent | 3929166413343f0acdba44694da7bf8ee44600bb (diff) | |
| download | paramiko-5540514928474956c25936ab48f7fa0b59755bb1.tar.gz | |
Merge branch '2.9' into 2.10
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/loop.py | 2 | ||||
| -rw-r--r-- | tests/test_transport.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/loop.py b/tests/loop.py index dd1f5a0c..40179a64 100644 --- a/tests/loop.py +++ b/tests/loop.py @@ -81,7 +81,7 @@ class LoopSocket(object): self.__lock.acquire() try: self.__in_buffer += data - self.__cv.notifyAll() + self.__cv.notify_all() finally: self.__lock.release() diff --git a/tests/test_transport.py b/tests/test_transport.py index 2eb95b31..fa7a3c1a 100644 --- a/tests/test_transport.py +++ b/tests/test_transport.py @@ -756,7 +756,7 @@ class TransportTest(unittest.TestCase): threading.Thread.__init__( self, None, None, self.__class__.__name__ ) - self.setDaemon(True) + self.daemon = True self.chan = chan self.iterations = iterations self.done_event = done_event @@ -780,7 +780,7 @@ class TransportTest(unittest.TestCase): threading.Thread.__init__( self, None, None, self.__class__.__name__ ) - self.setDaemon(True) + self.daemon = True self.chan = chan self.done_event = done_event self.watchdog_event = threading.Event() |