From patchwork Fri May 31 19:36:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 14181 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 876031705A; Fri, 31 May 2019 20:37:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 17ACF1701E for ; Fri, 31 May 2019 20:37:14 +0100 (BST) Received: from localhost ([127.0.0.1]:48208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWnKz-0008Hp-MC for patchwork@mira.cbaines.net; Fri, 31 May 2019 15:37:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWnKr-0008CE-1o for guix-patches@gnu.org; Fri, 31 May 2019 15:37:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWnKp-0000Yi-G2 for guix-patches@gnu.org; Fri, 31 May 2019 15:37:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50977) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWnKp-0000Ya-D7 for guix-patches@gnu.org; Fri, 31 May 2019 15:37:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hWnKp-000192-8y for guix-patches@gnu.org; Fri, 31 May 2019 15:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35929] [PATCH 1/2] tests: hackage: Factor out package pattern. References: <20190527194556.59710-1-rob@vllmrt.net> In-Reply-To: <20190527194556.59710-1-rob@vllmrt.net> Resent-From: Robert Vollmert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 May 2019 19:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35929 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35929@debbugs.gnu.org Received: via spool by 35929-submit@debbugs.gnu.org id=B35929.15593314184373 (code B ref 35929); Fri, 31 May 2019 19:37:03 +0000 Received: (at 35929) by debbugs.gnu.org; 31 May 2019 19:36:58 +0000 Received: from localhost ([127.0.0.1]:36287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWnKj-00018L-RI for submit@debbugs.gnu.org; Fri, 31 May 2019 15:36:58 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:61124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWnKg-00017s-SI for 35929@debbugs.gnu.org; Fri, 31 May 2019 15:36:55 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 3EC2DA0008; Fri, 31 May 2019 21:36:49 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id ZfRp4JUzJ35h; Fri, 31 May 2019 21:36:34 +0200 (CEST) From: Robert Vollmert Date: Fri, 31 May 2019 21:36:28 +0200 Message-Id: <20190531193629.57733-1-rob@vllmrt.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Vollmert Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * tests/hackage.scm: Import result pattern matching via syntax rule. --- tests/hackage.scm | 149 +++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 75 deletions(-) diff --git a/tests/hackage.scm b/tests/hackage.scm index 0efad0638d..c73a28c1f5 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -155,93 +155,92 @@ library (test-begin "hackage") -(define* (eval-test-with-cabal test-cabal #:key (cabal-environment '())) - (mock - ((guix import hackage) hackage-fetch - (lambda (name-version) - (call-with-input-string test-cabal - read-cabal))) - (match (hackage->guix-package "foo" #:cabal-environment cabal-environment) - (('package - ('name "ghc-foo") - ('version "1.0.0") - ('source - ('origin - ('method 'url-fetch) - ('uri ('string-append - "https://hackage.haskell.org/package/foo/foo-" - 'version - ".tar.gz")) - ('sha256 - ('base32 - (? string? hash))))) - ('build-system 'haskell-build-system) - ('inputs - ('quasiquote - (("ghc-http" ('unquote 'ghc-http)) - ("ghc-mtl" ('unquote 'ghc-mtl))))) - ('home-page "http://test.org") - ('synopsis (? string?)) - ('description (? string?)) - ('license 'bsd-3)) - #t) - (x - (pk 'fail x #f))))) +(define-syntax-rule (make-cabal-import-test pattern) + (lambda* + (test-cabal #:key (cabal-environment '())) + (mock + ((guix import hackage) hackage-fetch + (lambda (name-version) + (call-with-input-string test-cabal + read-cabal))) + (match (hackage->guix-package "foo" #:cabal-environment cabal-environment) + (pattern #t) + (x (pk 'fail x #f)))))) + +(define test-cabal-ghc-foo + (make-cabal-import-test + ('package + ('name "ghc-foo") + ('version "1.0.0") + ('source + ('origin + ('method 'url-fetch) + ('uri ('string-append + "https://hackage.haskell.org/package/foo/foo-" + 'version + ".tar.gz")) + ('sha256 + ('base32 + (? string? hash))))) + ('build-system 'haskell-build-system) + ('inputs + ('quasiquote + (("ghc-http" ('unquote 'ghc-http)) + ("ghc-mtl" ('unquote 'ghc-mtl))))) + ('home-page "http://test.org") + ('synopsis (? string?)) + ('description (? string?)) + ('license 'bsd-3)))) (test-assert "hackage->guix-package test 1" - (eval-test-with-cabal test-cabal-1)) + (test-cabal-ghc-foo test-cabal-1)) (test-assert "hackage->guix-package test 2" - (eval-test-with-cabal test-cabal-2)) + (test-cabal-ghc-foo test-cabal-2)) (test-assert "hackage->guix-package test 3" - (eval-test-with-cabal test-cabal-3 - #:cabal-environment '(("impl" . "ghc-7.8")))) + (test-cabal-ghc-foo test-cabal-3 + #:cabal-environment '(("impl" . "ghc-7.8")))) (test-assert "hackage->guix-package test 4" - (eval-test-with-cabal test-cabal-4 - #:cabal-environment '(("impl" . "ghc-7.8")))) + (test-cabal-ghc-foo test-cabal-4 + #:cabal-environment '(("impl" . "ghc-7.8")))) (test-assert "hackage->guix-package test 5" - (eval-test-with-cabal test-cabal-5 - #:cabal-environment '(("impl" . "ghc-7.8")))) + (test-cabal-ghc-foo test-cabal-5 + #:cabal-environment '(("impl" . "ghc-7.8")))) + +(define test-cabal-ghc-foo-6 + (make-cabal-import-test + ('package + ('name "ghc-foo") + ('version "1.0.0") + ('source + ('origin + ('method 'url-fetch) + ('uri ('string-append + "https://hackage.haskell.org/package/foo/foo-" + 'version + ".tar.gz")) + ('sha256 + ('base32 + (? string? hash))))) + ('build-system 'haskell-build-system) + ('inputs + ('quasiquote + (("ghc-b" ('unquote 'ghc-b)) + ("ghc-http" ('unquote 'ghc-http)) + ("ghc-mtl" ('unquote 'ghc-mtl))))) + ('native-inputs + ('quasiquote + (("ghc-haskell-gi" ('unquote 'ghc-haskell-gi))))) + ('home-page "http://test.org") + ('synopsis (? string?)) + ('description (? string?)) + ('license 'bsd-3)))) (test-assert "hackage->guix-package test 6" - (mock - ((guix import hackage) hackage-fetch - (lambda (name-version) - (call-with-input-string test-cabal-6 - read-cabal))) - (match (hackage->guix-package "foo") - (('package - ('name "ghc-foo") - ('version "1.0.0") - ('source - ('origin - ('method 'url-fetch) - ('uri ('string-append - "https://hackage.haskell.org/package/foo/foo-" - 'version - ".tar.gz")) - ('sha256 - ('base32 - (? string? hash))))) - ('build-system 'haskell-build-system) - ('inputs - ('quasiquote - (("ghc-b" ('unquote 'ghc-b)) - ("ghc-http" ('unquote 'ghc-http)) - ("ghc-mtl" ('unquote 'ghc-mtl))))) - ('native-inputs - ('quasiquote - (("ghc-haskell-gi" ('unquote 'ghc-haskell-gi))))) - ('home-page "http://test.org") - ('synopsis (? string?)) - ('description (? string?)) - ('license 'bsd-3)) - #t) - (x - (pk 'fail x #f))))) + (test-cabal-ghc-foo-6 test-cabal-6)) (test-assert "read-cabal test 1" (match (call-with-input-string test-read-cabal-1 read-cabal)