From b26d982db46429f50428b51ebfb13dff71b50d9f Mon Sep 17 00:00:00 2001 From: DYefremov Date: Mon, 18 Mar 2019 22:54:59 +0300 Subject: [PATCH] added skip message for http test --- app/connections.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/connections.py b/app/connections.py index 4b958902..59643529 100644 --- a/app/connections.py +++ b/app/connections.py @@ -41,7 +41,7 @@ class TestException(Exception): pass -def download_data(*, properties, download_type=DownloadType.ALL, callback=None): +def download_data(*, properties, download_type=DownloadType.ALL, callback): with FTP(host=properties["host"], user=properties["user"], passwd=properties["password"]) as ftp: ftp.encoding = "utf-8" callback("FTP OK.\n") @@ -292,10 +292,11 @@ def test_ftp(host, port, user, password, timeout=5): raise TestException(e) -def test_http(host, port, user, password, timeout=5): +def test_http(host, port, user, password, timeout=5, skip_message=False): try: params = urlencode({"text": "Connection test", "type": 2, "timeout": timeout}) - url = "http://{}:{}/api/message?{}".format(host, port, params) + params = "statusinfo" if skip_message else "message?{}".format(params) + url = "http://{}:{}/api/{}".format(host, port, params) # authentication init_auth(user, password, url)