Merge pull request #70168 from dwoz/dwoz/fix/test-current-release-argon-master

test_version: assert current_release() contract, not a hardcoded codename

Author: dwoz

tests/pytests/unit/test_version.py

@@ -446,6 +446,12 @@ def test_current_release_matches_maintenance_branch_67061():
     built distribution.  Pin ``current_release()`` to the branch's own
     codename so the default version always matches the branch's calver
     series.
+
+    This asserts the *contract* -- current_release() returns the last
+    codename with released=True -- rather than a hardcoded codename.
+    That way the assertion tracks the released-flag state automatically
+    on every branch and doesn't need editing when new codenames flip
+    to released=True.
     """
     # Reset any cached _current_release that an earlier import set so we
     # exercise the real lookup path.
@@ -455,18 +461,15 @@ def test_current_release_matches_maintenance_branch_67061():
         _next_release=None,
         _current_release=None,
     ):
-        # The fix picks the *last* released codename rather than the first
-        # un-released one.  3008.x is still pre-release (ARGON.released is
-        # False), so the last released codename on this branch is its
-        # predecessor (CHLORINE).  Once 3008.x cuts its first release and
-        # ARGON flips to released=True, this assertion should be bumped.
+        released = [v for v in SaltVersionsInfo.versions() if v.released]
+        assert released, "SaltVersionsInfo table has no released codenames"
+        expected = released[-1]
         current = SaltVersionsInfo.current_release()
-        assert current == SaltVersionsInfo.CHLORINE, (
-            f"On the 3008.x branch the most-recent released codename is "
-            f"Chlorine (3007); current_release() returned "
-            f"{current.name} ({current.info[0]})."
+        assert current == expected, (
+            f"current_release() must return the last codename with "
+            f"released=True (expected {expected.name} / {expected.info[0]}), "
+            f"got {current.name} / {current.info[0]}."
         )
-        assert current.info[0] == 3007
 
 
 @pytest.mark.skip_unless_on_linux