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 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()) } }) } 90064f4707d18f0b17962e9438d75968839e'>commitdiff
path: root/tests/guix-environment-container.sh
AgeCommit message (Expand)Author
2019-10-03environment: '--container' honors '--preserve'....* guix/scripts/environment.scm (launch-environment/container): Add #:white-list parameter and honor it. (guix-environment): Pass #:white-list to 'launch-environment/container'. * tests/guix-environment-container.sh: Add test. Ludovic Courtès
2019-08-17tests: Move 'guix environment -C --no-cwd' test where it belongs....This ensures that this test is skipped in contexts where user namespaces are not supported, instead of failing. This is a followup to commit b6dc08393e6a8313b88ce422fc3c1e4e9c0efc6f. * tests/guix-environment.sh: Move '--container --no-cwd' test to... * tests/guix-environment-container.sh: ... here. Ludovic Courtès
2019-04-02environment: '-C' creates namespaces where the user is not root....* guix/scripts/environment.scm (launch-environment/container): Add UID and GID. Use them in PASSWD and GROUPS. Pass them as #:guest-uid and #:guest-gid to 'call-with-container'. * tests/guix-environment-container.sh: Test the inner UID. In '--user' test, replace hard-coded 0 with 1000. * doc/guix.texi (Invoking guix environment): Adjust accordingly. Ludovic Courtès
2019-03-26environment: Create /etc/group in containers....Reported by Pierre Neidhardt <mail@ambrevar.xyz>. * guix/scripts/environment.scm (launch-environment/container): Create GROUPS and call 'write-group'. * tests/guix-environment-container.sh: Test it. Ludovic Courtès
2019-03-26environment: Use (gnu build accounts) for /etc/passwd handling....* guix/scripts/environment.scm (launch-environment/container): Remove call to 'mock-passwd'; instantiate a <password-entry> instead. Call 'write-passwd' to write the pasword database instead of using custom code. (mock-passwd): Remove. * tests/guix-environment-container.sh: Test 'getpwuid'. Ludovic Courtès