From 7bd7d9eafd3a2d40c46a23426a886b1d51bbe6be Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 26 Jun 2020 14:25:03 +0000 Subject: [PATCH] Merge branch 'master' of gitlab.com:openlp/openlp_api_tester # Conflicts: # test_api/apitest/runner.py --- test_api/apitest/runner.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test_api/apitest/runner.py b/test_api/apitest/runner.py index 5cf24b9..9f4154e 100644 --- a/test_api/apitest/runner.py +++ b/test_api/apitest/runner.py @@ -26,9 +26,10 @@ import yaml from collections import deque from websocket import create_connection + from test_api.apitest.callbacks import * # noqa E403 -from test_api.apitest.logger import print_text, print_error, print_ok, print_info -# from test_api.apitest.logger import print_debug #n +from test_api.apitest.logger import print_error, print_ok, print_info +# from test_api.apitest.logger import print_debug from test_api.apitest.task import Task