diff options
author | Eric Eastwood <erice@element.io> | 2022-11-18 17:05:41 -0600 |
---|---|---|
committer | Eric Eastwood <erice@element.io> | 2022-11-18 17:05:41 -0600 |
commit | 04de9ea73809670f4ce2cf0dc085065a324453e8 (patch) | |
tree | 95cb00be91df21d3002651b0835eca8ea88645e5 /tests/utils.py | |
parent | Merge branch 'madlittlemods/11850-migrate-to-opentelemetry' into madlittlemod... (diff) | |
parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
download | synapse-04de9ea73809670f4ce2cf0dc085065a324453e8.tar.xz |
Merge branch 'madlittlemods/11850-migrate-to-opentelemetry' into madlittlemods/13356-messages-investigation-scratch-v1 github/madlittlemods/13356-messages-investigation-scratch-v1 madlittlemods/13356-messages-investigation-scratch-v1
Conflicts: synapse/handlers/federation.py synapse/handlers/relations.py
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/utils.py b/tests/utils.py index 65db437697..045a8b5fa7 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -270,9 +270,7 @@ class MockClock: *args: P.args, **kwargs: P.kwargs, ) -> None: - # This type-ignore should be redundant once we use a mypy release with - # https://github.com/python/mypy/pull/12668. - self.loopers.append(Looper(function, interval / 1000.0, self.now, args, kwargs)) # type: ignore[arg-type] + self.loopers.append(Looper(function, interval / 1000.0, self.now, args, kwargs)) def cancel_call_later(self, timer: Timer, ignore_errs: bool = False) -> None: if timer.expired: |