summary refs log tree commit diff
path: root/tests/test_state.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 09:30:17 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 09:30:17 -0500
commit287c81abf3c5b4bc01b4bf9c415b8ed939413c41 (patch)
tree013f1ce57cdaae78ae6d0ddf0ef7593ff63de5fa /tests/test_state.py
parentPreserve version string in user agent (diff)
parentExplicitly add Create event as auth event (diff)
downloadsynapse-287c81abf3c5b4bc01b4bf9c415b8ed939413c41.tar.xz
Merge branch 'develop' into daniel/useragent
Diffstat (limited to 'tests/test_state.py')
-rw-r--r--tests/test_state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_state.py b/tests/test_state.py

index 55f37c521f..0274c4bc18 100644 --- a/tests/test_state.py +++ b/tests/test_state.py
@@ -35,7 +35,7 @@ def create_event(name=None, type=None, state_key=None, depth=2, event_id=None, if not event_id: _next_event_id += 1 - event_id = str(_next_event_id) + event_id = "$%s:test" % (_next_event_id,) if not name: if state_key is not None: