aboutsummaryrefslogtreecommitdiffstats
path: root/_pytest/conftest.py
diff options
context:
space:
mode:
authorTrygve Aaberge <trygveaa@gmail.com>2020-04-19 03:02:47 +0200
committerTrygve Aaberge <trygveaa@gmail.com>2020-05-30 21:11:27 +0200
commit8d39f3c16620a4c3e584cab653119dd7aa2da45f (patch)
treeee82b7f591927054d43aec12095b4212c9d7b92e /_pytest/conftest.py
parent1faa03482a874abf96f82a7b486ae2a65087e694 (diff)
downloadwee-slack-8d39f3c16620a4c3e584cab653119dd7aa2da45f.tar.gz
Load new history after reconnect immediately when background_load_all_history is set
Fixes #629, fixes #715, closes #732
Diffstat (limited to '_pytest/conftest.py')
-rw-r--r--_pytest/conftest.py4
1 files changed, 2 insertions, 2 deletions
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')