[bug#51987] [PATCH] [core-updates-frozen] gnu: ledger: Remove failing test output.

[bug#51987] [PATCH] [core-updates-frozen] gnu: ledger: Remove failing test output.

[John Kehayias via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]

Hello,

I'm not sure why, but ledger started failing one of its test on core-updates-frozen. The test is for the error when trying to use a nonexistent file (as far as I can tell) and it fails in the error message reporting the path of the file without the leading "./". Output of the test below. The patch removes this test from ledger.

359/396 Test #359: RegressTest_BF3C1F82-2 ................................***Failed    0.04 sec
FAILURE in error output from /tmp/guix-build-ledger-3.2.1.drv-0/source/test/regress/BF3C1F82-2.test:
--
$ledger -f - reg
--
  @@ -1,2 +1,2 @@

   While parsing file "", line 2:

  -Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"

  +Error: File to include was not found: "non-existent-ledger-file-BF3C1F82"

E[BF3C1F82-2.test]STDERR:
b''
FAILURE in error output from /tmp/guix-build-ledger-3.2.1.drv-0/source/test/regress/BF3C1F82-2.test:
--
$ledger -f /dev/stdin reg
--
  @@ -1,2 +1,2 @@

   While parsing file "", line 2:

  -Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"

  +Error: File to include was not found: "non-existent-ledger-file-BF3C1F82"

E[BF3C1F82-2.test]STDERR:
b''

FAILED (2)

Thanks,
John

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-ledger-Remove-failing-test-output.patch --]
[-- Type: text/x-patch; name=0001-gnu-ledger-Remove-failing-test-output.patch, Size: 3560 bytes --]

From 279743a20221fb9e3454da889500515d6a2ef785 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Fri, 19 Nov 2021 17:38:51 -0500
Subject: [PATCH] gnu: ledger: Remove failing test output.

Removes a test which doesn't have output matching the expected (it misses the
leading "./").

* gnu/packages/finance.scm (php)[source]: Add patch.
* gnu/packages/patches/ledger-remove-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/finance.scm                      |  4 ++-
 gnu/packages/patches/ledger-remove-test.patch | 28 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/ledger-remove-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index d4a6b59e34..4931103ac6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1328,6 +1328,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/lcalc-lcommon-h.patch    		\
   %D%/packages/patches/lcalc-using-namespace-std.patch 		\
   %D%/packages/patches/ldns-drill-examples.patch		\
+  %D%/packages/patches/ledger-remove-test.patch			\
   %D%/packages/patches/leela-zero-gtest.patch			\
   %D%/packages/patches/less-hurd-path-max.patch			\
   %D%/packages/patches/liba52-enable-pic.patch			\
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index b6c6527aa0..322462a0c5 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2021 ZmnSCPxj jxPCSnmZ <ZmnSCPxj@protonmail.com>
 ;;; Copyright © 2021 François J <francois-oss@avalenn.eu>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -305,7 +306,8 @@ (define-public ledger
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6"))))
+        (base32 "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6"))
+       (patches (search-patches "ledger-remove-test.patch"))))
     (build-system cmake-build-system)
     (arguments
      `(#:modules (,@%cmake-build-system-modules
diff --git a/gnu/packages/patches/ledger-remove-test.patch b/gnu/packages/patches/ledger-remove-test.patch
new file mode 100644
index 0000000000..636784c3ac
--- /dev/null
+++ b/gnu/packages/patches/ledger-remove-test.patch
@@ -0,0 +1,28 @@
+This test started failing on core-updates-frozen sometime after this commit:
+
+https://git.savannah.gnu.org/cgit/guix.git/log/?id=727f05e1e285aa52f5a19ec923fdc2259859b4b1
+
+It reports the wrong error message, with a lack of a leading "./" in the file name. So it
+passes in that it correctly errors on the missing file, but has the wrong output. This
+patch removes the test file to ignore the test.
+
+diff --git a/test/regress/BF3C1F82-2.test b/test/regress/BF3C1F82-2.test
+deleted file mode 100644
+index a7808504..00000000
+--- a/test/regress/BF3C1F82-2.test
++++ /dev/null
+@@ -1,14 +0,0 @@
+-; Check that include directives are relative for "-f /dev/stdin"
+-include non-existent-ledger-file-BF3C1F82
+-
+-test -f - reg -> 1
+-__ERROR__
+-While parsing file "", line 2:
+-Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"
+-end test
+-
+-test -f /dev/stdin reg -> 1
+-__ERROR__
+-While parsing file "", line 2:
+-Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"
+-end test
-- 
2.33.1

[bug#51987] [PATCH] [core-updates-frozen] gnu: ledger: Remove failing test output.

[Guillaume Le Vaillant]

[-- Attachment #1: Type: text/plain, Size: 1167 bytes --]

John Kehayias via Guix-patches via <guix-patches@gnu.org> skribis:

> Hello,
>
> I'm not sure why, but ledger started failing one of its test on core-updates-frozen. The test is for the error when trying to use a nonexistent file (as far as I can tell) and it fails in the error message reporting the path of the file without the leading "./". Output of the test below. The patch removes this test from ledger.
>
> 359/396 Test #359: RegressTest_BF3C1F82-2 ................................***Failed    0.04 sec
> FAILURE in error output from /tmp/guix-build-ledger-3.2.1.drv-0/source/test/regress/BF3C1F82-2.test:
> --
> $ledger -f - reg
> --
>   @@ -1,2 +1,2 @@
>
>    While parsing file "", line 2:
>
>   -Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"
>
>   +Error: File to include was not found: "non-existent-ledger-file-BF3C1F82"
>
> E[BF3C1F82-2.test]STDERR:
> b''
> FAILURE in error output from /tmp/guix-build-ledger-3.2.1.drv-0/source/test/regress/BF3C1F82-2.test:
> --
> $ledger -f /dev/stdin reg

Hi,

Instead of adding a patch removing the file, wouldn't it be simpler to just add a phase
calling '(delete-file "test/...")'?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

[bug#51987] [PATCH] [core-updates-frozen] gnu: ledger: Remove failing test output.

[John Kehayias via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 577 bytes --]

Hello,

‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐

On Saturday, November 20th, 2021 at 4:19 AM, Guillaume Le Vaillant wrote:

> Instead of adding a patch removing the file, wouldn't it be simpler to just add a phase
> calling '(delete-file "test/...")'?

That's a very good point, much easier! I've attached v2 of the patch (commit message also had a typo before) where I used a snippet to remove the file. I haven't written a snippet before but seemed like a clean and explicit way to do the source modification here.

Hope that's better!

John

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-ledger-Remove-failing-test-output.patch --]
[-- Type: text/x-patch; name=0001-gnu-ledger-Remove-failing-test-output.patch, Size: 1711 bytes --]

From 49cfab2b6c52bd0be59f17f9bbcd669937beb2a6 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Sat, 20 Nov 2021 13:02:25 -0500
Subject: [PATCH V2] gnu: ledger: Remove failing test output.

* gnu/packages/finance.scm (ledger)[source]: Add snippet to remove a failing test.
---
 gnu/packages/finance.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 354a2f2e0f..0c045b7bd3 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2021 ZmnSCPxj jxPCSnmZ <ZmnSCPxj@protonmail.com>
 ;;; Copyright © 2021 François J <francois-oss@avalenn.eu>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -304,7 +305,14 @@ (define-public ledger
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6"))))
+        (base32 "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6"))
+       (snippet '(begin
+                   ;; Remove test that fails due to difference in
+                   ;; reported error message (missing leading "./" in the
+                   ;; file name); started some time after Guix commit
+                   ;; 727f05e1e285aa52f5a19ec923fdc2259859b4b1
+                   (delete-file "test/regress/BF3C1F82-2.test")
+                   #true))))
     (build-system cmake-build-system)
     (arguments
      `(#:modules (,@%cmake-build-system-modules
-- 
2.33.1

bug#51987: [PATCH] [core-updates-frozen] gnu: ledger: Remove failing test output.

[Guillaume Le Vaillant]

[-- Attachment #1: Type: text/plain, Size: 66 bytes --]

Patch pushed as c51667d52ed40b70cd15ff890141bff98f5e0d9a.
Thanks.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]