[checkmk-commits] Add multiline support in checktestlib.

Module: check_mk Branch: master Commit: d105a910d05b7e9a4ab14e3023dc142584b61538 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d105a910d05b7e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jun 18 16:13:56 2018 +0200 Add multiline support in checktestlib. Change-Id: I9dee8db9f556de4e54356c65b510d72ed7da5d58 --- tests/unit/checks/checktestlib.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index c5c8558..046ecce 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -77,8 +77,13 @@ class BasicCheckResult(Tuploid): self.status = status assert type(infotext) in [ str, unicode ] - assert "\n" not in infotext - self.infotext = infotext + + if "\n" in infotext: + self.infotext, \ + self.multiline = infotext.split("\n", 1) + else: + self.infotext = infotext + self.multiline = None if perfdata is not None: assert type(perfdata) == list @@ -95,11 +100,15 @@ class BasicCheckResult(Tuploid): @property def tuple(self): - return (self.status, self.infotext, self.perfdata) + return (self.status, self.infotext, self.perfdata, self.multiline) def __repr__(self): - return 'BasicCheckResult(%r, %r, %r)' % (self.status, self.infotext, self.perfdata) - + if self.multiline is not None: + return 'BasicCheckResult(%r, %r, %r)' % \ + (self.status, self.infotext, self.perfdata) + else: + return 'BasicCheckResult(%r, %r, %r, multiline=%r)' % \ + self.tuple class CheckResult(object):