Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 988032f

Browse files
V02460V02460
committed
Replace deprecated assertDictContainsSubset
by assertLessEqual on dict items() Signed-off-by: Kai A. Hiller <V02460@gmail.com>
1 parent 5316961 commit 988032f

File tree

9 files changed

+80
-71
lines changed

9 files changed

+80
-71
lines changed

‎tests/handlers/test_device.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,50 +123,50 @@ def test_get_devices_by_user(self) -> None:
123123

124124
self.assertEqual(3, len(res))
125125
device_map = {d["device_id"]: d for d in res}
126-
self.assertDictContainsSubset(
126+
self.assertLessEqual(
127127
{
128128
"user_id": user1,
129129
"device_id": "xyz",
130130
"display_name": "display 0",
131131
"last_seen_ip": None,
132132
"last_seen_ts": None,
133-
},
134-
device_map["xyz"],
133+
}.items(),
134+
device_map["xyz"].items(),
135135
)
136-
self.assertDictContainsSubset(
136+
self.assertLessEqual(
137137
{
138138
"user_id": user1,
139139
"device_id": "fco",
140140
"display_name": "display 1",
141141
"last_seen_ip": "ip1",
142142
"last_seen_ts": 1000000,
143-
},
144-
device_map["fco"],
143+
}.items(),
144+
device_map["fco"].items(),
145145
)
146-
self.assertDictContainsSubset(
146+
self.assertLessEqual(
147147
{
148148
"user_id": user1,
149149
"device_id": "abc",
150150
"display_name": "display 2",
151151
"last_seen_ip": "ip3",
152152
"last_seen_ts": 3000000,
153-
},
154-
device_map["abc"],
153+
}.items(),
154+
device_map["abc"].items(),
155155
)
156156

157157
def test_get_device(self) -> None:
158158
self._record_users()
159159

160160
res = self.get_success(self.handler.get_device(user1, "abc"))
161-
self.assertDictContainsSubset(
161+
self.assertLessEqual(
162162
{
163163
"user_id": user1,
164164
"device_id": "abc",
165165
"display_name": "display 2",
166166
"last_seen_ip": "ip3",
167167
"last_seen_ts": 3000000,
168-
},
169-
res,
168+
}.items(),
169+
res.items(),
170170
)
171171

172172
def test_delete_device(self) -> None:

‎tests/rest/client/test_login.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,9 @@ def test_spam_checker_deny(self) -> None:
569569
body,
570570
)
571571
self.assertEqual(channel.code, 403, channel.result)
572-
self.assertDictContainsSubset(
573-
{"errcode": Codes.LIMIT_EXCEEDED, "extra": "value"}, channel.json_body
572+
self.assertLessEqual(
573+
{"errcode": Codes.LIMIT_EXCEEDED, "extra": "value"}.items(),
574+
channel.json_body.items(),
574575
)
575576

576577

‎tests/rest/client/test_register.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def test_POST_appservice_registration_valid(self) -> None:
7575

7676
self.assertEqual(channel.code, 200, msg=channel.result)
7777
det_data = {"user_id": user_id, "home_server": self.hs.hostname}
78-
self.assertDictContainsSubset(det_data, channel.json_body)
78+
self.assertLessEqual(det_data.items(), channel.json_body.items())
7979

8080
def test_POST_appservice_registration_no_type(self) -> None:
8181
as_token = "i_am_an_app_service"
@@ -136,7 +136,7 @@ def test_POST_user_valid(self) -> None:
136136
"device_id": device_id,
137137
}
138138
self.assertEqual(channel.code, 200, msg=channel.result)
139-
self.assertDictContainsSubset(det_data, channel.json_body)
139+
self.assertLessEqual(det_data.items(), channel.json_body.items())
140140

141141
@override_config({"enable_registration": False})
142142
def test_POST_disabled_registration(self) -> None:
@@ -157,7 +157,7 @@ def test_POST_guest_registration(self) -> None:
157157

158158
det_data = {"home_server": self.hs.hostname, "device_id": "guest_device"}
159159
self.assertEqual(channel.code, 200, msg=channel.result)
160-
self.assertDictContainsSubset(det_data, channel.json_body)
160+
self.assertLessEqual(det_data.items(), channel.json_body.items())
161161

162162
def test_POST_disabled_guest_registration(self) -> None:
163163
self.hs.config.registration.allow_guest_access = False
@@ -267,7 +267,7 @@ def test_POST_registration_requires_token(self) -> None:
267267
"device_id": device_id,
268268
}
269269
self.assertEqual(channel.code, 200, msg=channel.result)
270-
self.assertDictContainsSubset(det_data, channel.json_body)
270+
self.assertLessEqual(det_data.items(), channel.json_body.items())
271271

272272
# Check the `completed` counter has been incremented and pending is 0
273273
res = self.get_success(

‎tests/rest/client/test_relations.py‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ def test_edit_reply(self) -> None:
570570
)
571571
self.assertEqual(200, channel.code, channel.json_body)
572572
event_result = channel.json_body
573-
self.assertDictContainsSubset(original_body, event_result["content"])
573+
self.assertLessEqual(original_body.items(), event_result["content"].items())
574574

575575
# also check /context, which returns the *edited* event
576576
channel = self.make_request(
@@ -587,14 +587,14 @@ def test_edit_reply(self) -> None:
587587
(context_result, "/context"),
588588
):
589589
# The reference metadata should still be intact.
590-
self.assertDictContainsSubset(
590+
self.assertLessEqual(
591591
{
592592
"m.relates_to": {
593593
"event_id": self.parent_id,
594594
"rel_type": "m.reference",
595595
}
596-
},
597-
result_event_dict["content"],
596+
}.items(),
597+
result_event_dict["content"].items(),
598598
desc,
599599
)
600600

@@ -1371,9 +1371,11 @@ def test_thread_edit_latest_event(self) -> None:
13711371
latest_event_in_thread = thread_summary["latest_event"]
13721372
# The latest event in the thread should have the edit appear under the
13731373
# bundled aggregations.
1374-
self.assertDictContainsSubset(
1375-
{"event_id": edit_event_id, "sender": "@alice:test"},
1376-
latest_event_in_thread["unsigned"]["m.relations"][RelationTypes.REPLACE],
1374+
self.assertLessEqual(
1375+
{"event_id": edit_event_id, "sender": "@alice:test"}.items(),
1376+
latest_event_in_thread["unsigned"]["m.relations"][
1377+
RelationTypes.REPLACE
1378+
].items(),
13771379
)
13781380

13791381
def test_aggregation_get_event_for_annotation(self) -> None:
@@ -1636,9 +1638,9 @@ def test_redact_relation_thread(self) -> None:
16361638
##################################################
16371639
self.assertEquals(self._get_related_events(), list(reversed(thread_replies)))
16381640
relations = self._get_bundled_aggregations()
1639-
self.assertDictContainsSubset(
1640-
{"count": 3, "current_user_participated": True},
1641-
relations[RelationTypes.THREAD],
1641+
self.assertLessEqual(
1642+
{"count": 3, "current_user_participated": True}.items(),
1643+
relations[RelationTypes.THREAD].items(),
16421644
)
16431645
# The latest event is the last sent event.
16441646
self.assertEqual(
@@ -1657,9 +1659,9 @@ def test_redact_relation_thread(self) -> None:
16571659
# The thread should still exist, but the latest event should be updated.
16581660
self.assertEquals(self._get_related_events(), list(reversed(thread_replies)))
16591661
relations = self._get_bundled_aggregations()
1660-
self.assertDictContainsSubset(
1661-
{"count": 2, "current_user_participated": True},
1662-
relations[RelationTypes.THREAD],
1662+
self.assertLessEqual(
1663+
{"count": 2, "current_user_participated": True}.items(),
1664+
relations[RelationTypes.THREAD].items(),
16631665
)
16641666
# And the latest event is the last unredacted event.
16651667
self.assertEqual(
@@ -1676,9 +1678,9 @@ def test_redact_relation_thread(self) -> None:
16761678
# Nothing should have changed (except the thread count).
16771679
self.assertEquals(self._get_related_events(), thread_replies)
16781680
relations = self._get_bundled_aggregations()
1679-
self.assertDictContainsSubset(
1680-
{"count": 1, "current_user_participated": True},
1681-
relations[RelationTypes.THREAD],
1681+
self.assertLessEqual(
1682+
{"count": 1, "current_user_participated": True}.items(),
1683+
relations[RelationTypes.THREAD].items(),
16821684
)
16831685
# And the latest event is the last unredacted event.
16841686
self.assertEqual(
@@ -1773,12 +1775,12 @@ def test_redact_parent_thread(self) -> None:
17731775
event_ids = self._get_related_events()
17741776
relations = self._get_bundled_aggregations()
17751777
self.assertEquals(len(event_ids), 1)
1776-
self.assertDictContainsSubset(
1778+
self.assertLessEqual(
17771779
{
17781780
"count": 1,
17791781
"current_user_participated": True,
1780-
},
1781-
relations[RelationTypes.THREAD],
1782+
}.items(),
1783+
relations[RelationTypes.THREAD].items(),
17821784
)
17831785
self.assertEqual(
17841786
relations[RelationTypes.THREAD]["latest_event"]["event_id"],

‎tests/storage/test_client_ips.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ def test_insert_new_client_ip(self) -> None:
6666
)
6767

6868
r = result[(user_id, device_id)]
69-
self.assertDictContainsSubset(
69+
self.assertLessEqual(
7070
{
7171
"user_id": user_id,
7272
"device_id": device_id,
7373
"ip": "ip",
7474
"user_agent": "user_agent",
7575
"last_seen": 12345678000,
76-
},
77-
r,
76+
}.items(),
77+
r.items(),
7878
)
7979

8080
def test_insert_new_client_ip_none_device_id(self) -> None:
@@ -529,15 +529,15 @@ def test_devices_last_seen_bg_update(self) -> None:
529529
)
530530

531531
r = result[(user_id, device_id)]
532-
self.assertDictContainsSubset(
532+
self.assertLessEqual(
533533
{
534534
"user_id": user_id,
535535
"device_id": device_id,
536536
"ip": None,
537537
"user_agent": None,
538538
"last_seen": None,
539-
},
540-
r,
539+
}.items(),
540+
r.items(),
541541
)
542542

543543
# Register the background update to run again.
@@ -564,15 +564,15 @@ def test_devices_last_seen_bg_update(self) -> None:
564564
)
565565

566566
r = result[(user_id, device_id)]
567-
self.assertDictContainsSubset(
567+
self.assertLessEqual(
568568
{
569569
"user_id": user_id,
570570
"device_id": device_id,
571571
"ip": "ip",
572572
"user_agent": "user_agent",
573573
"last_seen": 0,
574-
},
575-
r,
574+
}.items(),
575+
r.items(),
576576
)
577577

578578
def test_old_user_ips_pruned(self) -> None:
@@ -643,15 +643,15 @@ def test_old_user_ips_pruned(self) -> None:
643643
)
644644

645645
r = result2[(user_id, device_id)]
646-
self.assertDictContainsSubset(
646+
self.assertLessEqual(
647647
{
648648
"user_id": user_id,
649649
"device_id": device_id,
650650
"ip": "ip",
651651
"user_agent": "user_agent",
652652
"last_seen": 0,
653-
},
654-
r,
653+
}.items(),
654+
r.items(),
655655
)
656656

657657

@@ -715,13 +715,13 @@ def _runtest(
715715
self.store.get_last_client_ip_by_device(self.user_id, device_id)
716716
)
717717
r = result[(self.user_id, device_id)]
718-
self.assertDictContainsSubset(
718+
self.assertLessEqual(
719719
{
720720
"user_id": self.user_id,
721721
"device_id": device_id,
722722
"ip": expected_ip,
723723
"user_agent": "Mozzila pizza",
724724
"last_seen": 123456100,
725-
},
726-
r,
725+
}.items(),
726+
r.items(),
727727
)

‎tests/storage/test_devices.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ def test_store_new_device(self) -> None:
5858

5959
res = self.get_success(self.store.get_device("user_id", "device_id"))
6060
assert res is not None
61-
self.assertDictContainsSubset(
61+
self.assertLessEqual(
6262
{
6363
"user_id": "user_id",
6464
"device_id": "device_id",
6565
"display_name": "display_name",
66-
},
67-
res,
66+
}.items(),
67+
res.items(),
6868
)
6969

7070
def test_get_devices_by_user(self) -> None:
@@ -80,21 +80,21 @@ def test_get_devices_by_user(self) -> None:
8080

8181
res = self.get_success(self.store.get_devices_by_user("user_id"))
8282
self.assertEqual(2, len(res.keys()))
83-
self.assertDictContainsSubset(
83+
self.assertLessEqual(
8484
{
8585
"user_id": "user_id",
8686
"device_id": "device1",
8787
"display_name": "display_name 1",
88-
},
89-
res["device1"],
88+
}.items(),
89+
res["device1"].items(),
9090
)
91-
self.assertDictContainsSubset(
91+
self.assertLessEqual(
9292
{
9393
"user_id": "user_id",
9494
"device_id": "device2",
9595
"display_name": "display_name 2",
96-
},
97-
res["device2"],
96+
}.items(),
97+
res["device2"].items(),
9898
)
9999

100100
def test_count_devices_by_users(self) -> None:

‎tests/storage/test_end_to_end_keys.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def test_key_without_device_name(self) -> None:
3838
self.assertIn("user", res)
3939
self.assertIn("device", res["user"])
4040
dev = res["user"]["device"]
41-
self.assertDictContainsSubset(json, dev)
41+
self.assertLessEqual(json.items(), dev.items())
4242

4343
def test_reupload_key(self) -> None:
4444
now = 1470174257070
@@ -71,8 +71,12 @@ def test_get_key_with_device_name(self) -> None:
7171
self.assertIn("user", res)
7272
self.assertIn("device", res["user"])
7373
dev = res["user"]["device"]
74-
self.assertDictContainsSubset(
75-
{"key": "value", "unsigned": {"device_display_name": "display_name"}}, dev
74+
self.assertLessEqual(
75+
{
76+
"key": "value",
77+
"unsigned": {"device_display_name": "display_name"},
78+
}.items(),
79+
dev.items(),
7680
)
7781

7882
def test_multiple_devices(self) -> None:

0 commit comments

Comments
 (0)