From 92033e4ebcba3636a2f2364d2e07ad44737b2b41 Mon Sep 17 00:00:00 2001 From: "Paul \"LeoNerd\" Evans" Date: Wed, 27 Aug 2014 17:17:22 +0100 Subject: [PATCH 1/3] Add python shebang line and chmod +x setup.py --- setup.py | 2 ++ 1 file changed, 2 insertions(+) mode change 100644 => 100755 setup.py diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index f01eec436f..59ac4fbf94 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + # Copyright 2014 matrix.org # # Licensed under the Apache License, Version 2.0 (the "License"); From 410a74b0f3b1c32d2ffa85aa7fa5e372a3341b9b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 27 Aug 2014 17:21:30 +0100 Subject: [PATCH 2/3] If timeout=0, return immediately --- synapse/notifier.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/synapse/notifier.py b/synapse/notifier.py index 1656717cd7..3d3fcdabdb 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -178,9 +178,13 @@ class Notifier(object): if timeout: reactor.callLater(timeout/1000, self._timeout_listener, listener) - self._register_with_keys(listener) + self._register_with_keys(listener) + yield self._check_for_updates(listener) + if not timeout: + self._timeout_listener(listener) + return def _timeout_listener(self, listener): From e111a06e0a677fb3c8a7d7259a152fe2c6267975 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 27 Aug 2014 17:21:38 +0100 Subject: [PATCH 3/3] Fix tests. --- tests/handlers/test_federation.py | 3 +-- tests/handlers/test_room.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index a92d825f49..7f7e2b63a0 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -74,8 +74,7 @@ class FederationTestCase(unittest.TestCase): yield self.handlers.federation_handler.on_receive(event, False, False) self.datastore.persist_event.assert_called_once_with(event, False) - self.notifier.on_new_room_event.assert_called_once_with( - event, store_id) + self.notifier.on_new_room_event.assert_called_once_with(event) @defer.inlineCallbacks def test_invite_join_target_this(self): diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py index fddab8f74f..04d88cb199 100644 --- a/tests/handlers/test_room.py +++ b/tests/handlers/test_room.py @@ -116,7 +116,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase): event ) self.notifier.on_new_room_event.assert_called_once_with( - event, store_id) + event, extra_users=[self.hs.parse_userid(target_user_id)]) self.assertFalse(self.datastore.get_room.called) self.assertFalse(self.datastore.store_room.called) @@ -175,7 +175,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase): event ) self.notifier.on_new_room_event.assert_called_once_with( - event, store_id) + event, extra_users=[user]) join_signal_observer.assert_called_with( user=user, room_id=room_id)