diff options
| author | Sarah Morgensen <iskarian@mgsn.dev> | 2021-09-09 17:50:10 -0700 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-09-09 21:34:50 -0400 |
| commit | 63cc4dd5793b62802354a31d8e6913f065d3bcec (patch) | |
| tree | c76ba26d93152d0b07f755ddc792f2e240dad9d9 /gnu/packages | |
| parent | f161f111e0692da4103196a351081a6396f3834a (diff) | |
| download | guix-patches-63cc4dd5793b62802354a31d8e6913f065d3bcec.tar guix-patches-63cc4dd5793b62802354a31d8e6913f065d3bcec.tar.gz | |
gnu: go-github-com-urfave-cli-v2: Fix tests when building with Go 1.17.
* gnu/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/golang.scm (go-github-com-urfave-cli-v2)[origin]: Apply it.
Signed-off-by: Leo Famulari <leo@famulari.name>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/golang.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch | 37 |
2 files changed, 41 insertions, 1 deletions
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2d0bbdb30d..4c6b41e406 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5003,7 +5003,10 @@ fast and distributable command line applications in an expressive way.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "08pvn7gyfznni72xrxfh2x6xxa8ykr7l1ka278js8g8qkh71bj8l")))) + (base32 "08pvn7gyfznni72xrxfh2x6xxa8ykr7l1ka278js8g8qkh71bj8l")) + ;; XXX: Remove patch when updating. + (patches + (search-patches "go-github-com-urfave-cli-v2-fix-tests.patch")))) (arguments '(#:import-path "github.com/urfave/cli/v2")))) diff --git a/gnu/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch b/gnu/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch new file mode 100644 index 0000000000..87ccc2b655 --- /dev/null +++ b/gnu/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch @@ -0,0 +1,37 @@ +From upstream PR: https://github.com/urfave/cli/pull/1299 + +From: William Wilson <william.wilson@canonical.com> +Date: Tue, 31 Aug 2021 14:19:17 -0500 +Subject: Make test case compatible with Go 1.17 + +As of Go 1.17, the go flag package will panic if given a syntactically invalid +flag. This causes TestApp_RunAsSubCommandIncorrectUsage to panic and therefore +fail. See https://golang.org/doc/go1.17#flag for more information. + +--- +diff --git a/app_test.go b/app_test.go +index 7c38f6048..76e211d68 100644 +--- a/app_test.go ++++ b/app_test.go +@@ -476,18 +476,18 @@ func TestApp_RunAsSubCommandIncorrectUsage(t *testing.T) { + a := App{ + Name: "cmd", + Flags: []Flag{ +- &StringFlag{Name: "--foo"}, ++ &StringFlag{Name: "foo"}, + }, + Writer: bytes.NewBufferString(""), + } + + set := flag.NewFlagSet("", flag.ContinueOnError) +- _ = set.Parse([]string{"", "---foo"}) ++ _ = set.Parse([]string{"", "-bar"}) + c := &Context{flagSet: set} + + err := a.RunAsSubcommand(c) + +- expect(t, err, errors.New("bad flag syntax: ---foo")) ++ expect(t, err.Error(), "flag provided but not defined: -bar") + } + + func TestApp_CommandWithFlagBeforeTerminator(t *testing.T) { |