unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob cc510c1cfe1340b441c6a0823065e08eb6c770a7 1415 bytes (raw)
name: gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
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())
 			}
 		})
 	}

debug log:

solving cc510c1cfe ...
found cc510c1cfe in https://git.savannah.gnu.org/cgit/guix.git

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).