diff options
| author | Tristan van Berkom <tristan@codethink.co.uk> | 2020-12-21 17:15:38 +0900 |
|---|---|---|
| committer | Tristan van Berkom <tristan@codethink.co.uk> | 2020-12-22 14:30:59 +0900 |
| commit | 54e59c002f9e17714cb952503e0b36da82566f96 (patch) | |
| tree | b7d93664a506c0c767ff340af5b9fb1356010a43 | |
| parent | 6a703cd32bea90fb57d5710b91e0310fa6116994 (diff) | |
| download | buildstream-54e59c002f9e17714cb952503e0b36da82566f96.tar.gz | |
_cas/casdprocessmanager.py: Use Messenger convinence functions.
This also adjusts the very strange tests in tests/internals/cascache.py
which use unittest's MagicMock interface to inspect what happened on
specific python methods instead of doing proper end-to-end testing.
| -rw-r--r-- | src/buildstream/_cas/casdprocessmanager.py | 21 | ||||
| -rw-r--r-- | tests/internals/cascache.py | 26 |
2 files changed, 16 insertions, 31 deletions
diff --git a/src/buildstream/_cas/casdprocessmanager.py b/src/buildstream/_cas/casdprocessmanager.py index 20ff610eb..11a16f2cb 100644 --- a/src/buildstream/_cas/casdprocessmanager.py +++ b/src/buildstream/_cas/casdprocessmanager.py @@ -37,7 +37,6 @@ from .._protos.google.bytestream import bytestream_pb2_grpc from .. import _signals, utils from .._exceptions import CASCacheError -from .._message import Message, MessageType _CASD_MAX_LOGFILES = 10 _CASD_TIMEOUT = 300 # in seconds @@ -179,13 +178,8 @@ class CASDProcessManager: # buildbox-casd is already dead if messenger: - messenger.message( - Message( - MessageType.BUG, - "Buildbox-casd died during the run. Exit code: {}, Logs: {}".format( - return_code, self._logfile - ), - ) + messenger.bug( + "Buildbox-casd died during the run. Exit code: {}, Logs: {}".format(return_code, self._logfile) ) return @@ -207,17 +201,12 @@ class CASDProcessManager: self.process.wait(timeout=15) if messenger: - messenger.message( - Message(MessageType.WARN, "Buildbox-casd didn't exit in time and has been killed") - ) + messenger.warn("Buildbox-casd didn't exit in time and has been killed") return if return_code != 0 and messenger: - messenger.message( - Message( - MessageType.BUG, - "Buildbox-casd didn't exit cleanly. Exit code: {}, Logs: {}".format(return_code, self._logfile), - ) + messenger.bug( + "Buildbox-casd didn't exit cleanly. Exit code: {}, Logs: {}".format(return_code, self._logfile) ) # create_channel(): diff --git a/tests/internals/cascache.py b/tests/internals/cascache.py index e27e40974..046a14bbe 100644 --- a/tests/internals/cascache.py +++ b/tests/internals/cascache.py @@ -4,7 +4,6 @@ from unittest.mock import MagicMock from buildstream._cas.cascache import CASCache from buildstream._cas import casdprocessmanager -from buildstream._message import MessageType from buildstream._messenger import Messenger @@ -19,12 +18,11 @@ def test_report_when_cascache_dies_before_asked_to(tmp_path, monkeypatch): time.sleep(1) cache.release_resources(messenger) - assert messenger.message.call_count == 1 + assert messenger.bug.call_count == 1 - message = messenger.message.call_args[0][0] - assert message.message_type == MessageType.BUG - assert "0" in message.message - assert "died" in message.message + message = messenger.bug.call_args[0][0] + assert "0" in message + assert "died" in message def test_report_when_cascache_exits_not_cleanly(tmp_path, monkeypatch): @@ -42,12 +40,11 @@ def test_report_when_cascache_exits_not_cleanly(tmp_path, monkeypatch): time.sleep(1) cache.release_resources(messenger) - assert messenger.message.call_count == 1 + assert messenger.bug.call_count == 1 - message = messenger.message.call_args[0][0] - assert message.message_type == MessageType.BUG - assert "-15" in message.message - assert "cleanly" in message.message + message = messenger.bug.call_args[0][0] + assert "-15" in message + assert "cleanly" in message def test_report_when_cascache_is_forcefully_killed(tmp_path, monkeypatch): @@ -65,11 +62,10 @@ def test_report_when_cascache_is_forcefully_killed(tmp_path, monkeypatch): time.sleep(1) cache.release_resources(messenger) - assert messenger.message.call_count == 1 + assert messenger.warn.call_count == 1 - message = messenger.message.call_args[0][0] - assert message.message_type == MessageType.WARN - assert "killed" in message.message + message = messenger.warn.call_args[0][0] + assert "killed" in message def test_casd_redirects_stderr_to_file_and_rotate(tmp_path, monkeypatch): |