Hardcode the searched mailing lists and simplify the test

There's no real need for deployments to configure which lists are
searched when attaching a thread, so the `ARCHIVES_SEARCH_LISTS` setting
is replaced by an inline tuple in `getThreads`. The two tests are folded
into one that covers merging, deduplication, ordering and the 100 result
cap at once.

Author: FennemAI

pgcommitfest/commitfest/ajax.py

@@ -94,7 +94,7 @@ def getThreads(request):
         params["s"] = search
 
     messages = {}
-    for listname in settings.ARCHIVES_SEARCH_LISTS:
+    for listname in ("pgsql-hackers", "pgsql-bugs"):
         for m in _archivesAPI("/list/%s/latest.json" % listname, params):
             messages.setdefault(m["msgid"], m)
 

pgcommitfest/commitfest/tests/test_get_threads.py

@@ -5,69 +5,34 @@
 from pgcommitfest.commitfest.ajax import getThreads
 
 
-def _msg(msgid, date, subj):
-    return {"msgid": msgid, "date": date, "from": "a@example.com", "subj": subj}
-
-
-HACKERS = [
-    _msg("h1@example.com", "2026-01-03T00:00:00", "hackers thread"),
-    _msg("both@example.com", "2026-01-01T00:00:00", "sent to both lists"),
-]
-BUGS = [
-    _msg("b1@example.com", "2026-01-02T00:00:00", "BUG #1: bugs thread"),
-    _msg("both@example.com", "2026-01-01T00:00:00", "sent to both lists"),
-]
-
-
-def _fake_archives(suburl, params=None):
-    return {
-        "/list/pgsql-hackers/latest.json": HACKERS,
-        "/list/pgsql-bugs/latest.json": BUGS,
-    }[suburl]
+def _msg(msgid, date):
+    return {"msgid": msgid, "date": date, "from": "a@example.com", "subj": msgid}
 
 
 def test_get_threads_searches_hackers_and_bugs():
-    """The thread search should return threads from pgsql-bugs too."""
-    request = RequestFactory().get("/ajax/getThreads/", {"s": "thread", "a": "1"})
-
-    with patch(
-        "pgcommitfest.commitfest.ajax._archivesAPI", side_effect=_fake_archives
-    ) as api:
-        result = getThreads(request)
-
-    # Both lists are searched with the same parameters
-    assert [c.args for c in api.call_args_list] == [
-        ("/list/pgsql-hackers/latest.json", {"n": 100, "a": 1, "s": "thread"}),
-        ("/list/pgsql-bugs/latest.json", {"n": 100, "a": 1, "s": "thread"}),
-    ]
-
-    # Results are merged newest first, and the message sent to both lists
-    # shows up only once
-    assert [m["msgid"] for m in result] == [
-        "h1@example.com",
-        "b1@example.com",
-        "both@example.com",
-    ]
-
-
-def test_get_threads_limits_merged_result():
-    """Merging two lists should not return more than one list would."""
     hackers = [
-        _msg("h%d@example.com" % i, "2026-01-01T00:%02d:00" % (i % 60), "h")
-        for i in range(100)
-    ]
-    bugs = [
-        _msg("b%d@example.com" % i, "2026-01-02T00:%02d:00" % (i % 60), "b")
+        _msg("h%d" % i, "2026-01-01T%02d:%02d:00" % (i // 60, i % 60))
         for i in range(100)
     ]
+    # b1 is newer than everything on hackers, h99 was sent to both lists
+    bugs = [_msg("b1", "2026-01-02T00:00:00"), hackers[99]]
 
     def fake(suburl, params=None):
-        return hackers if "pgsql-hackers" in suburl else bugs
+        return {
+            "/list/pgsql-hackers/latest.json": hackers,
+            "/list/pgsql-bugs/latest.json": bugs,
+        }[suburl]
 
-    request = RequestFactory().get("/ajax/getThreads/")
-    with patch("pgcommitfest.commitfest.ajax._archivesAPI", side_effect=fake):
+    request = RequestFactory().get("/ajax/getThreads/", {"s": "x", "a": "1"})
+    with patch("pgcommitfest.commitfest.ajax._archivesAPI", side_effect=fake) as api:
         result = getThreads(request)
 
-    assert len(result) == 100
-    # The bugs messages are all newer, so they are the ones that are kept
-    assert all(m["msgid"].startswith("b") for m in result)
+    assert [c.args for c in api.call_args_list] == [
+        ("/list/pgsql-hackers/latest.json", {"n": 100, "a": 1, "s": "x"}),
+        ("/list/pgsql-bugs/latest.json", {"n": 100, "a": 1, "s": "x"}),
+    ]
+    # Merged newest first, h99 deduplicated, and capped at 100 so the oldest
+    # message (h0) is dropped.
+    assert [m["msgid"] for m in result] == ["b1"] + [
+        "h%d" % i for i in range(99, 0, -1)
+    ]

pgcommitfest/settings.py

@@ -157,8 +157,6 @@
 ARCHIVES_PORT = "8001"
 ARCHIVES_HOST = "archives.postgresql.org"  # Host: header to send
 ARCHIVES_APIKEY = None
-# Mailing lists searched when attaching a thread to a patch
-ARCHIVES_SEARCH_LISTS = ["pgsql-hackers", "pgsql-bugs"]
 
 # Email address to pgsql-hackers. Set to something local to test maybe?
 HACKERS_EMAIL = "pgsql-hackers-testing@localhost"