diff options
| author | Steven Hammerton <steven.hammerton@openmarket.com> | 2015-11-17 10:55:41 +0000 |
|---|---|---|
| committer | Steven Hammerton <steven.hammerton@openmarket.com> | 2015-11-17 10:55:41 +0000 |
| commit | f5e25c5f358de93f8bbba83496a44cf217ce086a (patch) | |
| tree | c01c8462aa3a004e103de4befc45b7f9206439b1 /tests/utils.py | |
| parent | Snakes not camels (diff) | |
| parent | Merge pull request #376 from matrix-org/daniel/jenkins (diff) | |
| download | synapse-f5e25c5f358de93f8bbba83496a44cf217ce086a.tar.xz | |
Merge branch 'develop' into sh-cas-auth-via-homeserver
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py index ca2c33cf8e..91040c2efd 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -243,6 +243,9 @@ class MockClock(object): else: self.timers.append(t) + def advance_time_msec(self, ms): + self.advance_time(ms / 1000.) + class SQLiteMemoryDbPool(ConnectionPool, object): def __init__(self): |