diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-03-01 15:08:24 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-03-01 15:08:24 +0000 |
| commit | a612ce66597f2d3837c468803044e0400e385fe6 (patch) | |
| tree | 0b5734ff804d1b7e24ea0039783695055f49f556 /tests/utils.py | |
| parent | Merge pull request #613 from matrix-org/markjh/yield (diff) | |
| parent | Add a /replication API for extracting the updates that happened on (diff) | |
| download | synapse-a612ce66597f2d3837c468803044e0400e385fe6.tar.xz | |
Merge pull request #489 from matrix-org/markjh/replication
Add a /replication API for extracting the updates that happened on synapse.
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/utils.py b/tests/utils.py index bf7a31ff9e..dfbee5c23a 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -239,9 +239,10 @@ class MockClock(object): def looping_call(self, function, interval): pass - def cancel_call_later(self, timer): + def cancel_call_later(self, timer, ignore_errs=False): if timer[2]: - raise Exception("Cannot cancel an expired timer") + if not ignore_errs: + raise Exception("Cannot cancel an expired timer") timer[2] = True self.timers = [t for t in self.timers if t != timer] |