summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-20 14:59:43 +0100
committerErik Johnston <erik@matrix.org>2014-08-20 14:59:43 +0100
commit5c4c591c614322e175eeded7ea6e82e9c9f68f77 (patch)
treea81a2cc04dff45e816f73c43f30cbbca6fa7bcf0
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-5c4c591c614322e175eeded7ea6e82e9c9f68f77.tar.xz
Fix federation test, since we now hit store.get_room
Diffstat (limited to '')
-rw-r--r--tests/handlers/test_federation.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index cb45169dd6..f4cf54b7ee 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2014 matrix.org
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,6 +40,7 @@ class FederationTestCase(unittest.TestCase):
             datastore=NonCallableMock(spec_set=[
                 "persist_event",
                 "store_room",
+                "get_room",
             ]),
             resource_for_federation=NonCallableMock(),
             http_client=NonCallableMock(spec_set=[]),
@@ -69,6 +69,7 @@ class FederationTestCase(unittest.TestCase):
 
         store_id = "ASD"
         self.datastore.persist_event.return_value = defer.succeed(store_id)
+        self.datastore.get_room.return_value = defer.succeed(True)
 
         yield self.handlers.federation_handler.on_receive(event, False, False)