More reliable UiWebsocket testing

This commit is contained in:
shortcutme 2019-03-16 00:15:19 +01:00
parent c474699695
commit 35e61a0c69
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE

View file

@ -301,7 +301,7 @@ def file_server6(request):
@pytest.fixture() @pytest.fixture()
def ui_websocket(site, file_server, user): def ui_websocket(site, user):
class WsMock: class WsMock:
def __init__(self): def __init__(self):
self.result = None self.result = None
@ -309,8 +309,13 @@ def ui_websocket(site, file_server, user):
def send(self, data): def send(self, data):
self.result = json.loads(data)["result"] self.result = json.loads(data)["result"]
def getResult(self):
back = self.result
self.result = None
return back
ws_mock = WsMock() 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): def testAction(action, *args, **kwargs):
func = getattr(ui_websocket, "action%s" % action) func = getattr(ui_websocket, "action%s" % action)