Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ All notable changes to this project will be documented in this file.

### Changed

#### 2026-01-13

* `./tests/base.py`: Added close method for `MockClient` to properly shutdown the client.
* `./tests/test_managesieve.py`: Fixed `tearDown` methods to shutdown the client and the server properly.

#### 2025-12-05

* `./pysieved/main.py`: Added file-based logging with `WatchedFileHandler` and removed syslog usage.
Expand Down
12 changes: 12 additions & 0 deletions tests/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,15 @@ def __init__(self, server: Server) -> None:
self.conn.settimeout(self._default_timeout)
self.conn.connect((address, port))

def close(self) -> None:
"""Terminate client."""

try:
self.conn.shutdown(socket.SHUT_RDWR)
self.conn.close()
except Exception:
pass

def get_full_response(self) -> bytes:
"""Read all the received lines until the server stops responding until the timeout."""

Expand All @@ -110,6 +119,9 @@ def get_full_response(self) -> bytes:
except Exception:
break

if not part:
break

full_response += part

return full_response
Expand Down
12 changes: 12 additions & 0 deletions tests/test_managesieve.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ def setUp(self) -> None:
self.password = "12345"

def tearDown(self) -> None:
try:
self.client.logout()
finally:
self.client.close()

self.server.shutdown()
self.server.server_close()
self._t.join()

super().tearDown()
Expand Down Expand Up @@ -110,7 +116,13 @@ def tearDownClass(cls) -> None:
# if not removed:
# warnings.warn(f"Could not remove filter '{cls.filter_name}'.")

try:
cls.client.logout()
finally:
cls.client.close()

cls.server.shutdown()
cls.server.server_close()
cls._t.join()

super().tearDownClass()
Expand Down