Skip to content

Commit 004d027

Browse files
committed
convert to set so that positional order is not relevant
1 parent 87ef7bc commit 004d027

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

tools/tokenserver/test_purge_old_records.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,11 @@ def test_purging_of_old_user_records(purge_db, mock_service_server):
135135
assert len(service_requests) == 2
136136

137137
# Check that the proper delete requests were made to the service.
138-
expected_kids = ["0000000000450-uw", "0000000000123-qg"]
139-
for i, environ in enumerate(service_requests):
138+
# Order is not asserted: the underlying query intentionally has no ORDER BY
139+
# (see _GET_OLD_USER_RECORDS_FOR_SERVICE), so kids are compared as a set.
140+
expected_kids = {"0000000000450-uw", "0000000000123-qg"}
141+
actual_kids = set()
142+
for environ in service_requests:
140143
# They must be to the correct path.
141144
assert environ["REQUEST_METHOD"] == "DELETE"
142145
assert re.match("/1.5/[0-9]+", environ["PATH_INFO"])
@@ -148,7 +151,8 @@ def test_purging_of_old_user_records(purge_db, mock_service_server):
148151
assert "uid" in userdata
149152
assert "node" in userdata
150153
assert userdata["fxa_uid"] == "test"
151-
assert userdata["fxa_kid"] == expected_kids[i]
154+
actual_kids.add(userdata["fxa_kid"])
155+
assert actual_kids == expected_kids
152156

153157
# Check that the user's current state is unaffected
154158
user = database.get_user(email)

0 commit comments

Comments
 (0)