diff options
| author | Erik Johnston <erikj@jki.re> | 2017-06-27 15:08:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 15:08:32 +0100 |
| commit | 816605a1376c9686557edf08c24280950214184f (patch) | |
| tree | f5c3a1983ab0a0c803218d5eada73299ecae316c /tests | |
| parent | Merge pull request #2290 from matrix-org/erikj/ensure_round_trip (diff) | |
| parent | Fix up client ips to read from pending data (diff) | |
| download | synapse-816605a1376c9686557edf08c24280950214184f.tar.xz | |
Merge pull request #2307 from matrix-org/erikj/user_ip_batch
Batch upsert user ips
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/storage/test_client_ips.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/storage/test_client_ips.py b/tests/storage/test_client_ips.py index 1f0c0e7c37..03df697575 100644 --- a/tests/storage/test_client_ips.py +++ b/tests/storage/test_client_ips.py @@ -43,10 +43,7 @@ class ClientIpStoreTestCase(tests.unittest.TestCase): "access_token", "ip", "user_agent", "device_id", ) - # deliberately use an iterable here to make sure that the lookup - # method doesn't iterate it twice - device_list = iter(((user_id, "device_id"),)) - result = yield self.store.get_last_client_ip_by_device(device_list) + result = yield self.store.get_last_client_ip_by_device(user_id, "device_id") r = result[(user_id, "device_id")] self.assertDictContainsSubset( |