From 35e61a0c6938768a06815950fc943d76f1123554 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sat, 16 Mar 2019 00:15:19 +0100 Subject: [PATCH] More reliable UiWebsocket testing --- src/Test/conftest.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Test/conftest.py b/src/Test/conftest.py index ed954764..62782f1e 100644 --- a/src/Test/conftest.py +++ b/src/Test/conftest.py @@ -301,7 +301,7 @@ def file_server6(request): @pytest.fixture() -def ui_websocket(site, file_server, user): +def ui_websocket(site, user): class WsMock: def __init__(self): self.result = None @@ -309,8 +309,13 @@ def ui_websocket(site, file_server, user): def send(self, data): self.result = json.loads(data)["result"] + def getResult(self): + back = self.result + self.result = None + return back + ws_mock = WsMock() - ui_websocket = UiWebsocket(ws_mock, site, file_server, user, None) + ui_websocket = UiWebsocket(ws_mock, site, None, user, None) def testAction(action, *args, **kwargs): func = getattr(ui_websocket, "action%s" % action)