diff options
| author | David Robertson <davidr@element.io> | 2022-12-01 13:43:30 +0000 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2022-12-01 13:43:30 +0000 |
| commit | 781b14ec69897a3b993fc46e43480a04cf2ad5f4 (patch) | |
| tree | 169c9f3cfe3246c3a76fd9627e8ae917a012901a /tests | |
| parent | Modernize unit tests configuration settings for workers. (#14568) (diff) | |
| parent | 1.73.0rc2 (diff) | |
| download | synapse-781b14ec69897a3b993fc46e43480a04cf2ad5f4.tar.xz | |
Merge branch 'release-v1.73' into develop
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/handlers/test_device.py | 2 | ||||
| -rw-r--r-- | tests/storage/test_client_ips.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/handlers/test_device.py b/tests/handlers/test_device.py index a456bffd63..ce7525e29c 100644 --- a/tests/handlers/test_device.py +++ b/tests/handlers/test_device.py @@ -115,7 +115,7 @@ class DeviceTestCase(unittest.HomeserverTestCase): "device_id": "xyz", "display_name": "display 0", "last_seen_ip": None, - "last_seen_ts": 1000000, + "last_seen_ts": None, }, device_map["xyz"], ) diff --git a/tests/storage/test_client_ips.py b/tests/storage/test_client_ips.py index a9af1babed..49ad3c1324 100644 --- a/tests/storage/test_client_ips.py +++ b/tests/storage/test_client_ips.py @@ -169,8 +169,6 @@ class ClientIpStoreTestCase(unittest.HomeserverTestCase): ) ) - last_seen = self.clock.time_msec() - if after_persisting: # Trigger the storage loop self.reactor.advance(10) @@ -191,7 +189,7 @@ class ClientIpStoreTestCase(unittest.HomeserverTestCase): "device_id": device_id, "ip": None, "user_agent": None, - "last_seen": last_seen, + "last_seen": None, }, ], ) |