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 | |
| 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')
| -rw-r--r-- | tests/handlers/test_device.py | 3 | ||||
| -rw-r--r-- | tests/storage/test_client_ips.py | 5 |
2 files changed, 2 insertions, 6 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) diff --git a/tests/storage/test_client_ips.py b/tests/storage/test_client_ips.py index 03df697575..bd6fda6cb1 100644 --- a/tests/storage/test_client_ips.py +++ b/tests/storage/test_client_ips.py @@ -15,9 +15,6 @@ from twisted.internet import defer -import synapse.server -import synapse.storage -import synapse.types import tests.unittest import tests.utils @@ -39,7 +36,7 @@ class ClientIpStoreTestCase(tests.unittest.TestCase): self.clock.now = 12345678 user_id = "@user:id" yield self.store.insert_client_ip( - synapse.types.UserID.from_string(user_id), + user_id, "access_token", "ip", "user_agent", "device_id", ) |