summary refs log tree commit diff
path: root/tests/util/test_clock.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-04-23 00:53:18 +0100
committerRichard van der Hoff <richard@matrix.org>2018-04-23 00:53:18 +0100
commit1ea904b9f09ea6a9df7792f61029d0250602d46b (patch)
treedba8c218f2d842c2c447d3c64d57b2cb3a789fd8 /tests/util/test_clock.py
parentMerge pull request #3106 from NotAFile/py3-six-itervalues-1 (diff)
downloadsynapse-1ea904b9f09ea6a9df7792f61029d0250602d46b.tar.xz
Use deferred.addTimeout instead of time_bound_deferred
This doesn't feel like a wheel we need to reinvent.
Diffstat (limited to 'tests/util/test_clock.py')
-rw-r--r--tests/util/test_clock.py33
1 files changed, 0 insertions, 33 deletions
diff --git a/tests/util/test_clock.py b/tests/util/test_clock.py
deleted file mode 100644
index 9672603579..0000000000
--- a/tests/util/test_clock.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- 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