Merge branch 'master' of gitlab.com:openlp/openlp_api_tester

# Conflicts:
#	test_api/apitest/runner.py
This commit is contained in:
Tim Bentley 2020-06-26 14:25:03 +00:00
parent ddb8d1ac73
commit 7bd7d9eafd

View File

@ -26,9 +26,10 @@ import yaml
from collections import deque from collections import deque
from websocket import create_connection from websocket import create_connection
from test_api.apitest.callbacks import * # noqa E403 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_error, print_ok, print_info
# from test_api.apitest.logger import print_debug #n # from test_api.apitest.logger import print_debug
from test_api.apitest.task import Task from test_api.apitest.task import Task