From d15ad0fdc560796f14cb70c27266d9be482d7638 Mon Sep 17 00:00:00 2001 From: Thorben Bochenek Date: Wed, 8 Feb 2023 08:49:27 +0100 Subject: [PATCH 1/2] Update server.py --- pytest_sftpserver/sftp/server.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pytest_sftpserver/sftp/server.py b/pytest_sftpserver/sftp/server.py index cb22328..341e79a 100644 --- a/pytest_sftpserver/sftp/server.py +++ b/pytest_sftpserver/sftp/server.py @@ -19,7 +19,7 @@ from socketserver import StreamRequestHandler, TCPServer, ThreadingMixIn -class SFTPRequestHandler(StreamRequestHandler): +class SFTPRequestHandler(StreamRequestHandler): def handle(self): transport = Transport(self.request) transport.add_server_key(self.host_key) @@ -43,7 +43,10 @@ def host_key(self): return RSAKey.from_private_key_file(SERVER_KEY_PRIVATE) -class SFTPServer(Thread, ThreadingMixIn, TCPServer): +class SFTPServer(Thread, ThreadingMixIn, TCPServer): + daemon_threads = True + block_on_close = False + def __init__(self, content_object=None, content_provider_class=ContentProvider): self.content_provider = content_provider_class(content_object) TCPServer.__init__(self, ("127.0.0.1", 0), SFTPRequestHandler, False) From 5b1c78c16f10732e167b607bf14132b45952aaad Mon Sep 17 00:00:00 2001 From: Thorben Bochenek Date: Wed, 8 Feb 2023 08:54:48 +0100 Subject: [PATCH 2/2] Update server.py --- pytest_sftpserver/sftp/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest_sftpserver/sftp/server.py b/pytest_sftpserver/sftp/server.py index 341e79a..a017942 100644 --- a/pytest_sftpserver/sftp/server.py +++ b/pytest_sftpserver/sftp/server.py @@ -19,7 +19,7 @@ from socketserver import StreamRequestHandler, TCPServer, ThreadingMixIn -class SFTPRequestHandler(StreamRequestHandler): +class SFTPRequestHandler(StreamRequestHandler): def handle(self): transport = Transport(self.request) transport.add_server_key(self.host_key)