diff options
| author | Erik Johnston <erikj@jki.re> | 2017-07-06 14:33:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 14:33:14 +0100 |
| commit | ed9a7f5436e1a8e5a301e8d4f667f3a22d4b028f (patch) | |
| tree | 7b741de4707c9da52abf654b525ebe8e44362c24 /tests/handlers/test_device.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Serialize user ip command as json (diff) | |
| download | synapse-ed9a7f5436e1a8e5a301e8d4f667f3a22d4b028f.tar.xz | |
Merge pull request #2309 from matrix-org/erikj/user_ip_repl
Fix up user_ip replication commands
Diffstat (limited to 'tests/handlers/test_device.py')
| -rw-r--r-- | tests/handlers/test_device.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/handlers/test_device.py b/tests/handlers/test_device.py index 2eaaa8253c..778ff2f6e9 100644 --- a/tests/handlers/test_device.py +++ b/tests/handlers/test_device.py @@ -19,7 +19,6 @@ import synapse.api.errors import synapse.handlers.device import synapse.storage -from synapse import types from tests import unittest, utils user1 = "@boris:aaa" @@ -179,6 +178,6 @@ class DeviceTestCase(unittest.TestCase): if ip is not None: yield self.store.insert_client_ip( - types.UserID.from_string(user_id), + user_id, access_token, ip, "user_agent", device_id) self.clock.advance_time(1000) |