forked-synapse/tests
Erik Johnston 347242a5c4 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
	tests/rest/test_presence.py
	tests/rest/test_rooms.py
	tests/utils.py
2014-08-19 14:48:19 +01:00
..
events add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it 2014-08-13 03:32:18 +01:00
federation Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server 2014-08-19 11:16:23 +01:00
handlers Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor 2014-08-19 14:48:19 +01:00
rest Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor 2014-08-19 14:48:19 +01:00
storage add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it 2014-08-13 03:32:18 +01:00
util add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it 2014-08-13 03:32:18 +01:00
__init__.py add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it 2014-08-13 03:32:18 +01:00
test_distributor.py add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it 2014-08-13 03:32:18 +01:00
test_state.py Fix some of the tests to reflect changes in the storage layer. 2014-08-15 17:42:21 +01:00
test_types.py Add a HomeServer.parse_roomalias() to avoid having to RoomAlias.from_sring(..., hs=hs) - similar to parse_userid() 2014-08-13 18:03:41 +01:00
utils.py Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor 2014-08-19 14:48:19 +01:00