From 8d39f3c16620a4c3e584cab653119dd7aa2da45f Mon Sep 17 00:00:00 2001 From: Trygve Aaberge Date: Sun, 19 Apr 2020 03:02:47 +0200 Subject: Load new history after reconnect immediately when background_load_all_history is set Fixes #629, fixes #715, closes #732 --- _pytest/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '_pytest/conftest.py') diff --git a/_pytest/conftest.py b/_pytest/conftest.py index fb30751..e37c2ae 100644 --- a/_pytest/conftest.py +++ b/_pytest/conftest.py @@ -12,7 +12,7 @@ from websocket import ABNF sys.path.append(".") import wee_slack -from wee_slack import EventRouter, SlackRequest +from wee_slack import EventRouter, SlackRequest, initiate_connection class fakewebsocket(object): def __init__(self): @@ -38,7 +38,7 @@ def mock_websocket(): def realish_eventrouter(mock_websocket, mock_weechat): e = EventRouter() wee_slack.EVENTROUTER = e - context = e.store_context(SlackRequest(None, 'rtm.start', {}, token='xoxs-token')) + context = e.store_context(initiate_connection('xoxs-token')) with open('_pytest/data/http/rtm.start.json') as rtmstartfile: if sys.version_info.major == 2: rtmstartdata = rtmstartfile.read().decode('utf-8') -- cgit