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 |
|
Paul "LeoNerd" Evans
|
fcdc40a5dd
|
Add a DeferredMockCallable; like mock's MockCallable but allows awaiting
on method calls to be made later
|
2014-08-19 14:25:43 +01:00 |
|
Paul "LeoNerd" Evans
|
bb793019a5
|
Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server
|
2014-08-19 11:16:23 +01:00 |
|
Erik Johnston
|
663a259d64
|
Change the MemoryDataStore to implement new storage api
|
2014-08-18 11:08:03 +01:00 |
|
Erik Johnston
|
f5fca6f787
|
Fix some of the tests to reflect changes in the storage layer.
|
2014-08-15 17:42:21 +01:00 |
|
Paul "LeoNerd" Evans
|
a6a9b71da0
|
Allow advancing the MockClock's time
|
2014-08-13 19:19:15 +01:00 |
|
Paul "LeoNerd" Evans
|
fc778e2bce
|
Move MockClock into tests.utils so we can reüse it
|
2014-08-13 19:19:15 +01:00 |
|
Matthew Hodgson
|
3e35a9f96e
|
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 |
|
matrix.org
|
4f475c7697
|
Reference Matrix Home Server
|
2014-08-12 15:10:52 +01:00 |