02/03: gnu: restic: Patch tests for go-1.16.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 1273548f4facefa379ae3607b47891959c42c13d
Author: Sarah Morgensen <iskarian@mgsn.dev>
AuthorDate: Thu Aug 5 13:20:07 2021 -0700

    gnu: restic: Patch tests for go-1.16.
    
    * gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch: New
    file.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/backup.scm (restic): Use it.
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/local.mk                                       |  1 +
 gnu/packages/backup.scm                            |  5 ++-
 .../restic-0.9.6-fix-tests-for-go1.15.patch        | 51 ++++++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 61ac396..caa9090 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1693,6 +1693,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/rtags-separate-rct.patch                        \
   %D%/packages/patches/racket-minimal-sh-via-rktio.patch       \
   %D%/packages/patches/remake-impure-dirs.patch                        \
+  %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \
   %D%/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch      \
   %D%/packages/patches/rnp-add-version.cmake.patch             \
   %D%/packages/patches/rnp-disable-ruby-rnp-tests.patch                \
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 9ec4e28..d8d8728 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2021 Timothy Sample <samplet@ngyro.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -928,7 +929,9 @@ is like a time machine for your data. ")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1zmh42aah32ah8w5n6ilz9bci0y2xrf8p7qshy3yf1lzm5gnbj0w"))))
+                "1zmh42aah32ah8w5n6ilz9bci0y2xrf8p7qshy3yf1lzm5gnbj0w"))
+              (patches
+               (search-patches "restic-0.9.6-fix-tests-for-go1.15.patch"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/restic/restic"
diff --git a/gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch 
b/gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch
new file mode 100644
index 0000000..cc510c1
--- /dev/null
+++ b/gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch
@@ -0,0 +1,51 @@
+This cherry-picked patch fixes tests for Go >= 1.15. Restic v0.10 (which
+includes this patch) requires go module support from the Go build system.
+Original patch follows.
+
+---
+From 97950ab81a18de06b95384da6d8646fef87c9d97 Mon Sep 17 00:00:00 2001
+From: Alexander Neumann <alexander@bumpern.de>
+Date: Sat, 12 Sep 2020 17:36:44 +0200
+Subject: [PATCH] options: Fix test for Go >= 1.15
+
+---
+ internal/options/options_test.go | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/internal/options/options_test.go 
b/internal/options/options_test.go
+index de94fc90a1..8d268992a3 100644
+--- a/internal/options/options_test.go
++++ b/internal/options/options_test.go
+@@ -3,6 +3,7 @@ package options
+ import (
+       "fmt"
+       "reflect"
++      "regexp"
+       "testing"
+       "time"
+ )
+@@ -199,7 +200,7 @@ var invalidSetTests = []struct {
+                       "timeout": "2134",
+               },
+               "ns",
+-              `time: missing unit in duration 2134`,
++              `time: missing unit in duration "?2134"?`,
+       },
+ }
+ 
+@@ -212,8 +213,13 @@ func TestOptionsApplyInvalid(t *testing.T) {
+                               t.Fatalf("expected error %v not found", 
test.err)
+                       }
+ 
+-                      if err.Error() != test.err {
+-                              t.Fatalf("expected error %q, got %q", test.err, 
err.Error())
++                      matched, err := regexp.MatchString(test.err, 
err.Error())
++                      if err != nil {
++                              t.Fatal(err)
++                      }
++
++                      if !matched {
++                              t.Fatalf("expected error to match %q, got %q", 
test.err, err.Error())
+                       }
+               })
+       }