diff options
author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-03-23 22:22:54 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-23 22:22:54 +0000 |
commit | 06ce7335e94d51e7b750e7c51a3445a05e191c3e (patch) | |
tree | 4a0f43cd52dbbcc9c5eea365b4c404a7b29c3179 /tests | |
parent | Merge pull request #1783 from pik/filter-validation (diff) | |
parent | Fix time_bound_deferred to throw the right exception (diff) | |
download | synapse-06ce7335e94d51e7b750e7c51a3445a05e191c3e.tar.xz |
Merge pull request #2052 from matrix-org/rav/time_bound_deferred
Fix time_bound_deferred to throw the right exception
Diffstat (limited to 'tests')
-rw-r--r-- | tests/util/test_clock.py | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/tests/util/test_clock.py b/tests/util/test_clock.py new file mode 100644 index 0000000000..9672603579 --- /dev/null +++ b/tests/util/test_clock.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Vector Creations Ltd +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +from synapse import util +from twisted.internet import defer +from tests import unittest + + +class ClockTestCase(unittest.TestCase): + @defer.inlineCallbacks + def test_time_bound_deferred(self): + # just a deferred which never resolves + slow_deferred = defer.Deferred() + + clock = util.Clock() + time_bound = clock.time_bound_deferred(slow_deferred, 0.001) + + try: + yield time_bound + self.fail("Expected timedout error, but got nothing") + except util.DeferredTimedOutError: + pass |