From d38dd01e85a149b79e0e002f82fc3b41b223e204 Mon Sep 17 00:00:00 2001
From: Miran <narimiran@disroot.org>
Date: Mon, 6 Jul 2026 11:22:27 +0200
Subject: [PATCH] remove the `allowFailure` option from package testing
 (#25965)

It is not used and it wastes CI resources.

(cherry picked from commit ae9141200da6fb44ae2aa73827ba37593d6c738b)
---
 .github/workflows/ci_packages.yml |  2 +-
 testament/categories.nim          | 16 +++++----------
 testament/important_packages.nim  |  9 ++-------
 testament/testament.nim           | 33 +++++++++++++------------------
 4 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/ci_packages.yml b/.github/workflows/ci_packages.yml
index fb9f474495..3ab1a10e65 100644
--- a/.github/workflows/ci_packages.yml
+++ b/.github/workflows/ci_packages.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        batch: ["allowed_failures", "0_3", "1_3", "2_3"] # list of `index_num`
+        batch: ["0_3", "1_3", "2_3"] # list of `index_num`
         include:
           - os: ubuntu-latest
             cpu: amd64
diff --git a/testament/categories.nim b/testament/categories.nim
index eba1e3cb27..00c5b93dab 100644
--- a/testament/categories.nim
+++ b/testament/categories.nim
@@ -409,16 +409,13 @@ proc listPackages(packageFilter: string): seq[NimblePackage] =
     # at least should be a regex; a substring match makes no sense.
     result = pkgs.filterIt(packageFilter in it.name)
   else:
-    if testamentData0.batchArg == "allowed_failures":
-      result = pkgs.filterIt(it.allowFailure)
-    elif testamentData0.testamentNumBatch == 0:
+    if testamentData0.testamentNumBatch == 0:
       result = pkgs
     else:
       result = @[]
-      let pkgs2 = pkgs.filterIt(not it.allowFailure)
-      for i in 0..<pkgs2.len:
+      for i in 0..<pkgs.len:
         if i mod testamentData0.testamentNumBatch == testamentData0.testamentBatch:
-          result.add pkgs2[i]
+          result.add pkgs[i]
 
 proc makeSupTest(test, options: string, cat: Category, debugInfo = ""): TTest =
   result = TTest(cat: cat, name: test, options: options, debugInfo: debugInfo,
@@ -447,10 +444,7 @@ proc testNimblePackages(r: var TResults; cat: Category; packageFilter: string) =
           (outp, status) = execCmdEx(cmd, workingDir = workingDir2)
           status == QuitSuccess
         if not ok:
-          if pkg.allowFailure:
-            inc r.passed
-            inc r.failedButAllowed
-          r.finishTest(test, targetC, "", "", cmd & "\n" & outp, reFailed, allowFailure = pkg.allowFailure)
+          r.finishTest(test, targetC, "", "", cmd & "\n" & outp, reFailed)
           continue
         outp
 
@@ -466,7 +460,7 @@ proc testNimblePackages(r: var TResults; cat: Category; packageFilter: string) =
         discard tryCommand(cmds[i], maxRetries = 3)
       discard tryCommand(cmds[^1], reFailed = reBuildFailed)
       inc r.passed
-      r.finishTest(test, targetC, "", "", "", reSuccess, allowFailure = pkg.allowFailure)
+      r.finishTest(test, targetC, "", "", "", reSuccess)
 
     errors = r.total - r.passed
     if errors == 0:
diff --git a/testament/important_packages.nim b/testament/important_packages.nim
index 03521aae1f..87c40ba561 100644
--- a/testament/important_packages.nim
+++ b/testament/important_packages.nim
@@ -22,16 +22,11 @@ When this is the case, a workaround is to test this package here by adding `--pa
 type NimblePackage* = object
   name*, cmd*, url*: string
   useHead*: bool
-  allowFailure*: bool
-    ## When true, we still run the test but the test is allowed to fail.
-    ## This is useful for packages that currently fail but that we still want to
-    ## run in CI, e.g. so that we can monitor when they start working again and
-    ## are reminded about those failures without making CI fail for unrelated PRs.
 
 var packages*: seq[NimblePackage]
 
-proc pkg(name: string; cmd = "nimble test -l"; url = "", useHead = true, allowFailure = false) =
-  packages.add NimblePackage(name: name, cmd: cmd, url: url, useHead: useHead, allowFailure: allowFailure)
+proc pkg(name: string; cmd = "nimble test -l"; url = "", useHead = true) =
+  packages.add NimblePackage(name: name, cmd: cmd, url: url, useHead: useHead)
 
 pkg "alea"
 pkg "argparse"
diff --git a/testament/testament.nim b/testament/testament.nim
index ed9029ac24..a0e1f910ed 100644
--- a/testament/testament.nim
+++ b/testament/testament.nim
@@ -86,8 +86,7 @@ proc isNimRepoTests(): bool =
 type
   Category = distinct string
   TResults = object
-    total, passed, failedButAllowed, skipped: int
-      ## xxx rename passed to passedOrAllowedFailure
+    total, passed, skipped: int
     data: string
   TTest = object
     name: string
@@ -232,7 +231,6 @@ proc initResults: TResults =
   result = TResults(
     total: 0,
     passed: 0,
-    failedButAllowed: 0,
     skipped: 0,
     data: ""
   )
@@ -262,28 +260,25 @@ template maybeStyledEcho(args: varargs[untyped]): untyped =
 
 proc `$`(x: TResults): string =
   result = """
-Tests passed or allowed to fail: $2 / $1 <br />
-Tests failed and allowed to fail: $3 / $1 <br />
-Tests skipped: $4 / $1 <br />
-""" % [$x.total, $x.passed, $x.failedButAllowed, $x.skipped]
+Tests passed: $2 / $1 <br />
+Tests skipped: $3 / $1 <br />
+""" % [$x.total, $x.passed, $x.skipped]
 
-proc testName(test: TTest, target: TTarget, extraOptions: string, allowFailure: bool): string =
+proc testName(test: TTest, target: TTarget, extraOptions: string): string =
   var name = test.name.replace(DirSep, '/')
   name.add ' ' & $target
-  if allowFailure:
-    name.add " (allowed to fail) "
   if test.options.len > 0: name.add ' ' & test.options
   if extraOptions.len > 0: name.add ' ' & extraOptions
   name.strip()
 
 proc addResult(r: var TResults, test: TTest, target: TTarget,
                extraOptions, expected, given: string, success: TResultEnum, duration: float,
-               allowFailure = false, givenSpec: ptr TSpec = nil) =
+               givenSpec: ptr TSpec = nil) =
   # instead of `ptr TSpec` we could also use `Option[TSpec]`; passing `givenSpec` makes it easier to get what we need
   # instead of having to pass individual fields, or abusing existing ones like expected vs given.
   # test.name is easier to find than test.name.extractFilename
   # A bit hacky but simple and works with tests/testament/tshould_not_work.nim
-  let name = testName(test, target, extraOptions, allowFailure)
+  let name = testName(test, target, extraOptions)
 
   let durationStr = duration.formatFloat(ffDecimal, precision = 2).align(5)
   if backendLogging:
@@ -346,22 +341,22 @@ proc addResult(r: var TResults, test: TTest, target: TTarget,
 
 proc finishTest(r: var TResults, test: TTest, target: TTarget,
                 extraOptions, expected, given: string, successOrig: TResultEnum,
-                allowFailure = false, givenSpec: ptr TSpec = nil) =
+                givenSpec: ptr TSpec = nil) =
   ## calculates duration of test, reports result
   ## `retries` option in the test is ignored
   let duration = epochTime() - test.startTime
   let success = if test.spec.timeout > 0.0 and duration > test.spec.timeout: reTimeout
                 else: successOrig
-  addResult(r, test, target, extraOptions, expected, given, success, duration, allowFailure, givenSpec)
+  addResult(r, test, target, extraOptions, expected, given, success, duration, givenSpec)
 
 proc finishTestRetryable(r: var TResults, test: TTest, target: TTarget,
                          extraOptions, expected, given: string, successOrig: TResultEnum,
-                         allowFailure = false, givenSpec: ptr TSpec = nil): bool =
+                         givenSpec: ptr TSpec = nil): bool =
   ## if test failed and has remaining retries, return `true`,
   ## otherwise calculate duration and report result
-  ## 
+  ##
   ## warning: if `true` is returned, then the result is not reported,
-  ## it has to be retried or `finishTest` should be called instead 
+  ## it has to be retried or `finishTest` should be called instead
   result = false
   let duration = epochTime() - test.startTime
   let success = if test.spec.timeout > 0.0 and duration > test.spec.timeout: reTimeout
@@ -369,7 +364,7 @@ proc finishTestRetryable(r: var TResults, test: TTest, target: TTarget,
   if test.spec.retries > 0 and success notin {reSuccess, reDisabled, reJoined, reInvalidSpec}:
     return true
   else:
-    addResult(r, test, target, extraOptions, expected, given, success, duration, allowFailure, givenSpec)
+    addResult(r, test, target, extraOptions, expected, given, success, duration, givenSpec)
 
 proc toString(inlineError: InlineError, filename: string): string =
   result = "$file($line, $col) $kind: $msg" % [
@@ -497,7 +492,7 @@ proc testSpecHelper(r: var TResults, test: var TTest, expected: TSpec,
       return
   if test.spec.err != reRetry:
     test.startTime = epochTime()
-  if testName(test, target, extraOptions, false) in skips:
+  if testName(test, target, extraOptions) in skips:
     test.spec.err = reDisabled
 
   if test.spec.err in {reDisabled, reJoined}: