summary refs log tree commit diff
path: root/tests/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2023-03-31 13:51:51 +0100
committerGitHub <noreply@github.com>2023-03-31 13:51:51 +0100
commit6204c3663eabec57e897e7e75180b959a936e1fe (patch)
treeb4c4e7e6b91b60c7c40670a6a149acb0c753e491 /tests/handlers
parentRevert "Set thread_id column to non-null for event_push_{actions,actions_stag... (diff)
downloadsynapse-6204c3663eabec57e897e7e75180b959a936e1fe.tar.xz
Revert pruning of old devices (#15360)
* Revert "Fix registering a device on an account with lots of devices (#15348)"

This reverts commit f0d8f66eaaacfa75bed65bc5d0c602fbc5339c85.

* Revert "Delete stale non-e2e devices for users, take 3 (#15183)"

This reverts commit 78cdb72cd6b0e007c314d9fed9f629dfc5b937a6.
Diffstat (limited to 'tests/handlers')
-rw-r--r--tests/handlers/test_admin.py2
-rw-r--r--tests/handlers/test_device.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/handlers/test_admin.py b/tests/handlers/test_admin.py
index f0ba3775c8..5569ccef8a 100644
--- a/tests/handlers/test_admin.py
+++ b/tests/handlers/test_admin.py
@@ -272,7 +272,7 @@ class ExfiltrateData(unittest.HomeserverTestCase):
         self.assertIn("device_id", args[0][0])
         self.assertIsNone(args[0][0]["display_name"])
         self.assertIsNone(args[0][0]["last_seen_user_agent"])
-        self.assertEqual(args[0][0]["last_seen_ts"], 600)
+        self.assertIsNone(args[0][0]["last_seen_ts"])
         self.assertIsNone(args[0][0]["last_seen_ip"])
 
     def test_connections(self) -> None:
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"],
         )