From 1410e580891d7e0a4942aa62dca9456261d6ce5d Mon Sep 17 00:00:00 2001 From: Kai Schwarz Date: Fri, 4 Oct 2019 14:58:27 +0200 Subject: [PATCH] fix(responsetemplate/mgr): pep8 review of response description usage --- hexonet/apiconnector/responsetemplate.py | 3 ++- tests/test_responsetemplate.py | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hexonet/apiconnector/responsetemplate.py b/hexonet/apiconnector/responsetemplate.py index 7cd5cc3..7b0bdce 100644 --- a/hexonet/apiconnector/responsetemplate.py +++ b/hexonet/apiconnector/responsetemplate.py @@ -18,10 +18,11 @@ class ResponseTemplate(object): """ def __init__(self, response=""): + descr = "Empty API response. Probably unreachable API end point" #: Holds the response as plain text / string self.__raw = response if (response is "") or (response is None): - self.__raw = "[RESPONSE]\r\nCODE=423\r\nDESCRIPTION=Empty API response. Probably unreachable API end point\r\nEOF\r\n" + self.__raw = "[RESPONSE]\r\nCODE=423\r\nDESCRIPTION=%s\r\nEOF\r\n" % (descr) # try/except to support old versions of python (python2.5) try: diff --git a/tests/test_responsetemplate.py b/tests/test_responsetemplate.py index 105d0a0..de7738e 100644 --- a/tests/test_responsetemplate.py +++ b/tests/test_responsetemplate.py @@ -2,22 +2,24 @@ def test_responsetemplatemethods(): + descr = "Empty API response. Probably unreachable API end point" # check instance [raw empty string] tpl = ResponseTemplate() assert tpl.getCode() == 423 - assert tpl.getDescription() == 'Empty API response. Probably unreachable API end point' + assert tpl.getDescription() == descr # #.getHash h = tpl.getHash() assert h["CODE"] == '423' - assert h["DESCRIPTION"] == 'Empty API response. Probably unreachable API end point' + assert h["DESCRIPTION"] == descr # #.getQueuetime # [not in api response] assert tpl.getQueuetime() == 0.00 # [in api response] tpl2 = ResponseTemplate( - '[RESPONSE]\r\ncode=423\r\ndescription=Empty API response. Probably unreachable API end point\r\nqueuetime=0\r\nruntime=0.12\r\nEOF\r\n') + '[RESPONSE]\r\ncode=423\r\ndescription=%s\r\nqueuetime=0\r\nruntime=0.12\r\nEOF\r\n' % (descr) + ) assert tpl2.getQueuetime() == 0.00 # #.getRuntime @@ -31,5 +33,6 @@ def test_responsetemplatemethods(): assert tpl.isPending() is False # [in api response] tpl2 = ResponseTemplate( - '[RESPONSE]\r\ncode=423\r\ndescription=Empty API response. Probably unreachable API end point\r\npending=1\r\nEOF\r\n') + '[RESPONSE]\r\ncode=423\r\ndescription=%s\r\npending=1\r\nEOF\r\n' % (descr) + ) assert tpl2.isPending() is True