From patchwork Sun Apr 28 10:52:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 63530 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5BA7327BBEA; Sun, 28 Apr 2024 11:54:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4700527BBE9 for ; Sun, 28 Apr 2024 11:54:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s12AE-0001z8-CD; Sun, 28 Apr 2024 06:53:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s12AB-0001ya-Hi for guix-patches@gnu.org; Sun, 28 Apr 2024 06:53:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s12AB-0005gv-9M for guix-patches@gnu.org; Sun, 28 Apr 2024 06:53:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s12AU-0005Fe-CE; Sun, 28 Apr 2024 06:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70625] [PATCH] gnu: Add go-github-com-warpfork-go-wish. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 28 Apr 2024 10:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70625 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70625@debbugs.gnu.org Cc: "Artyom V. Poptsov" , cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com Received: via spool by submit@debbugs.gnu.org id=B.171430161920166 (code B ref -1); Sun, 28 Apr 2024 10:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2024 10:53:39 +0000 Received: from localhost ([127.0.0.1]:50166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s12A7-0005FC-5I for submit@debbugs.gnu.org; Sun, 28 Apr 2024 06:53:39 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s12A5-0005F6-7W for submit@debbugs.gnu.org; Sun, 28 Apr 2024 06:53:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s129g-0001x5-Ij for guix-patches@gnu.org; Sun, 28 Apr 2024 06:53:12 -0400 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s129e-0005cS-Gi for guix-patches@gnu.org; Sun, 28 Apr 2024 06:53:12 -0400 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-51c66cc680aso2646345e87.1 for ; Sun, 28 Apr 2024 03:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714301588; x=1714906388; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cd5s83OCVKJCuzFKHV0hFJtL4N6DcEPr3FyTSfU72RA=; b=TTGbSO9AX7s22kBWa6M1eQ3PDwhPPSdIzEd6lG6wglDcl3vzlThsJg7v/uTsaJD0zW LaaxvJzOmK/2pIZOgXy29MgAdYVVhmjd3kQj4dPY9gaqMdI7GUlTOfK4jO38O5TP6jLG fPYgFujsyYM2upoms0JTBvA39E95l9/yKqleNWRYYFjSnAzNtyVkQH4rGb8bBezeMjoB 9Xn5DHVsWGC6hekxX3LVR6PvzKCOdtcRI6gMVRjqJTkdzXG0J2HrxpObhuwQ00S26xr5 EAdeFM6XbRZ+GWG4oj0mNjh3kIjijVntJdaz8lN1RaXiqvrDnfGFRiPnBDp+ZrSr/YyQ 6u6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714301588; x=1714906388; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cd5s83OCVKJCuzFKHV0hFJtL4N6DcEPr3FyTSfU72RA=; b=mADYDXsFUPnPWX13ZGKpBxwvnFxLSRgkuN9ci6zJUQBG03iZ3rqeGwBnzQHNoSsiJQ I2HLIgkw5Go43Fj/tKrf6bcHrWOTdsMYhJaRkgEmKNgHVgT4kjFxkGvSxmKzZu4iESMQ vBcyxB5r13w1h/BAcH/Firn7bblGfHrS7mlgil6Tba4d7u/jqzPjn3LaCrOQMLLUrMzz 5d7bW1wbMbeb+VYa2jCzITGEJw0zGn0wZ/ws1lw5m2IA15TvG2FeKdaoXu2PfThfJ3PK m3TRh4D6phDKKBW4WoljJyq2Ti+zSehtDV6CQDgXh8RMqMA7KVbMfNWeulfPGYqtn7Op FE6g== X-Gm-Message-State: AOJu0Yz6K73+K9bjTv4OsWqpDcnptEmzq2uQcFyxNdZtG1gMyKHm0Tfz mkWBV7k9WBJ9uNKMxQSKJtUaIDfd9Z6azJOtI4WkmLHmu2FZCs4U+ZpWpQ== X-Google-Smtp-Source: AGHT+IHgRufWSvwPBDz7m/eTTj6a4rlEMjDdGEuUizcXEKaSGnU9SEq/zfpOEbgLmPBrUqkJzpx+Ig== X-Received: by 2002:ac2:5329:0:b0:51b:a86:ab57 with SMTP id f9-20020ac25329000000b0051b0a86ab57mr1479880lfh.22.1714301587166; Sun, 28 Apr 2024 03:53:07 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id c14-20020a056512238e00b0051b0deb0d4asm2529673lfv.236.2024.04.28.03.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Apr 2024 03:53:06 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sun, 28 Apr 2024 13:52:54 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x135.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang-xyz.scm (go-github-com-warpfork-go-wish): New variable. * gnu/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add "go-github-com-warpfork-go-wish-fix-tests.patch". Change-Id: Ic3245a1112ef2e04b22cf26be23f27bf3ff90e9e --- gnu/local.mk | 1 + gnu/packages/golang-xyz.scm | 28 ++++++ ...ithub-com-warpfork-go-wish-fix-tests.patch | 85 +++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 gnu/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch base-commit: 4178eaf3b2eeea8f6c2e49b1d65cd60a1663c4a9 diff --git a/gnu/local.mk b/gnu/local.mk index 42961e60b2..03c91cfb9d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1394,6 +1394,7 @@ dist_patch_DATA = \ %D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \ %D%/packages/patches/go-github-com-urfave-cli-fix-tests.patch \ %D%/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch \ + %D%/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch \ %D%/packages/patches/go-github-com-wraparound-wrap-free-fonts.patch \ %D%/packages/patches/go-skip-gc-test.patch \ %D%/packages/patches/gourmet-sqlalchemy-compat.patch \ diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index fcb352148c..34e9220e40 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -3132,6 +3132,34 @@ (define-public go-github-com-vividcortex-ewma weighted moving averages}.") (license license:expat))) +(define-public go-github-com-warpfork-go-wish + (package + (name "go-github-com-warpfork-go-wish") + (version "0.0.0-20220906213052-39a1cc7a02d0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/warpfork/go-wish") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rqbxmqwzy1q2zwy3mszp0li0pg8zzh3j9l8wlzr6p1pq2idallq")) + (patches (search-patches + "go-github-com-warpfork-go-wish-fix-tests.patch")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/warpfork/go-wish")) + (home-page "https://github.com/warpfork/go-wish") + (synopsis "Simple, functional, composable test assertions for Go") + (description + "@code{wish} is a test assertion library for Go, designed to gracefully enhance +the Go standard library testing package and behaviors of the @command{go test} +command.") + (license license:expat))) + (define-public go-github-com-whyrusleeping-go-sysinfo (package (name "go-github-com-whyrusleeping-go-sysinfo") diff --git a/gnu/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch b/gnu/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch new file mode 100644 index 0000000000..27738ac59b --- /dev/null +++ b/gnu/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch @@ -0,0 +1,85 @@ +From d53c651a8fd65656e486eb5c7e20ab889f64639b Mon Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" +Date: Sun, 28 Apr 2024 13:24:34 +0300 +Subject: [PATCH] output_test.go: Fix tests + +* output_test.go (TestGoTestOutputTree, TestGoTestOutputFun): Fix + tests. +--- + output_test.go | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +diff --git a/output_test.go b/output_test.go +index eb3e0e9..58948c2 100644 +--- a/output_test.go ++++ b/output_test.go +@@ -75,15 +75,15 @@ func TestGoTestOutputTree(t *testing.T) { + diff := strdiff(nom, Dedent(` + === RUN TestGoTestOutputTree_helper + === RUN TestGoTestOutputTree_helper/subtest ++ output_test.go:NN: wtf + === RUN TestGoTestOutputTree_helper/subtest/subsubtest ++ output_test.go:NN: sadz + === RUN TestGoTestOutputTree_helper/subtest/happy_subsubtest ++ output_test.go:NN: ooh! + --- FAIL: TestGoTestOutputTree_helper (N.NNs) + --- FAIL: TestGoTestOutputTree_helper/subtest (N.NNs) +- output_test.go:NN: wtf + --- FAIL: TestGoTestOutputTree_helper/subtest/subsubtest (N.NNs) +- output_test.go:NN: sadz + --- PASS: TestGoTestOutputTree_helper/subtest/happy_subsubtest (N.NNs) +- output_test.go:NN: ooh! + FAIL + exit status N + FAIL github.com/warpfork/go-wish N.NNNs +@@ -149,28 +149,28 @@ func TestGoTestOutputFun(t *testing.T) { + diff := strdiff(nom, Dedent(` + === RUN TestGoTestOutputFun_helper + === RUN TestGoTestOutputFun_helper/subtest ++ output_test.go:NNN: hello! + === RUN TestGoTestOutputFun_helper/subtest/subsubtest ++ output_test.go:NNN: ShouldEqual check rejected: ++ @@ -N +N @@ ++ - snafoo ++ + zounds ++ ++ output_test.go:NNN: ShouldEqual check rejected: ++ @@ -N +N @@ ++ - zebras ++ + cats ++ ++ output_test.go:NNN: ShouldEqual check rejected: ++ interface{}( ++ - struct{ Foo string }{}, ++ + struct{ Bar string }{}, ++ ) ++ + === RUN TestGoTestOutputFun_helper/subtest/happy_subsubtest + --- FAIL: TestGoTestOutputFun_helper (N.NNs) + --- FAIL: TestGoTestOutputFun_helper/subtest (N.NNs) +- output_test.go:NNN: hello! + --- FAIL: TestGoTestOutputFun_helper/subtest/subsubtest (N.NNs) +- output_test.go:NNN: ShouldEqual check rejected: +- @@ -N +N @@ +- - snafoo +- + zounds +- +- output_test.go:NNN: ShouldEqual check rejected: +- @@ -N +N @@ +- - zebras +- + cats +- +- output_test.go:NNN: ShouldEqual check rejected: +- interface{}( +- - struct{ Foo string }{}, +- + struct{ Bar string }{}, +- ) +- + --- PASS: TestGoTestOutputFun_helper/subtest/happy_subsubtest (N.NNs) + FAIL + exit status N + +base-commit: 39a1cc7a02d01d037bc6bc075e6550279026e645 +-- +2.41.0 +