diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index a4ef60b911..96570f9072 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -197,6 +197,7 @@ class FederationTestCase(unittest.TestCase):
'pdu_failures': [],
},
json_data_callback=ANY,
+ long_retries=True,
)
@defer.inlineCallbacks
@@ -228,6 +229,7 @@ class FederationTestCase(unittest.TestCase):
'pdu_failures': [],
},
json_data_callback=ANY,
+ long_retries=True,
)
@defer.inlineCallbacks
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 10d4482cce..c42b5b80d7 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -365,7 +365,7 @@ class PresenceInvitesTestCase(PresenceTestCase):
# TODO(paul): This test will likely break if/when real auth permissions
# are added; for now the HS will always accept any invite
- yield self.handler.send_invite(
+ yield self.handler.send_presence_invite(
observer_user=self.u_apple, observed_user=self.u_banana)
self.assertEquals(
@@ -384,7 +384,7 @@ class PresenceInvitesTestCase(PresenceTestCase):
@defer.inlineCallbacks
def test_invite_local_nonexistant(self):
- yield self.handler.send_invite(
+ yield self.handler.send_presence_invite(
observer_user=self.u_apple, observed_user=self.u_durian)
self.assertEquals(
@@ -409,11 +409,12 @@ class PresenceInvitesTestCase(PresenceTestCase):
}
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
- yield self.handler.send_invite(
+ yield self.handler.send_presence_invite(
observer_user=self.u_apple, observed_user=u_rocket)
self.assertEquals(
@@ -443,6 +444,7 @@ class PresenceInvitesTestCase(PresenceTestCase):
}
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -483,6 +485,7 @@ class PresenceInvitesTestCase(PresenceTestCase):
}
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -827,6 +830,7 @@ class PresencePushTestCase(MockedDatastorePresenceTestCase):
}
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -843,6 +847,7 @@ class PresencePushTestCase(MockedDatastorePresenceTestCase):
}
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -1033,6 +1038,7 @@ class PresencePushTestCase(MockedDatastorePresenceTestCase):
}
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -1048,6 +1054,7 @@ class PresencePushTestCase(MockedDatastorePresenceTestCase):
}
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -1078,6 +1085,7 @@ class PresencePushTestCase(MockedDatastorePresenceTestCase):
}
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -1184,6 +1192,7 @@ class PresencePollingTestCase(MockedDatastorePresenceTestCase):
},
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -1200,6 +1209,7 @@ class PresencePollingTestCase(MockedDatastorePresenceTestCase):
},
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -1232,6 +1242,7 @@ class PresencePollingTestCase(MockedDatastorePresenceTestCase):
},
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -1265,6 +1276,7 @@ class PresencePollingTestCase(MockedDatastorePresenceTestCase):
},
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -1297,6 +1309,7 @@ class PresencePollingTestCase(MockedDatastorePresenceTestCase):
},
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index 2d7ba43561..5b1feeb45b 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -218,6 +218,7 @@ class TypingNotificationsTestCase(unittest.TestCase):
}
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
@@ -284,6 +285,7 @@ class TypingNotificationsTestCase(unittest.TestCase):
}
),
json_data_callback=ANY,
+ long_retries=True,
),
defer.succeed((200, "OK"))
)
diff --git a/tests/storage/test_events.py b/tests/storage/test_events.py
index 313013009e..946cd3e9f2 100644
--- a/tests/storage/test_events.py
+++ b/tests/storage/test_events.py
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import uuid
-from mock.mock import Mock
+from mock import Mock
from synapse.types import RoomID, UserID
from tests import unittest
diff --git a/tests/utils.py b/tests/utils.py
index 91040c2efd..aee69b1caa 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -168,8 +168,9 @@ class MockHttpResource(HttpServer):
raise KeyError("No event can handle %s" % path)
- def register_path(self, method, path_pattern, callback):
- self.callbacks.append((method, path_pattern, callback))
+ def register_paths(self, method, path_patterns, callback):
+ for path_pattern in path_patterns:
+ self.callbacks.append((method, path_pattern, callback))
class MockKey(object):
|
