From patchwork Fri May 31 21:22:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 14184 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 69B591706A; Fri, 31 May 2019 22:40:12 +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 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 2DD0D17068 for ; Fri, 31 May 2019 22:40:12 +0100 (BST) Received: from localhost ([127.0.0.1]:49471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWpFz-0004s8-QU for patchwork@mira.cbaines.net; Fri, 31 May 2019 17:40:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWpFS-0004Jp-Ve for guix-patches@gnu.org; Fri, 31 May 2019 17:39:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWp0M-0007aO-N0 for guix-patches@gnu.org; Fri, 31 May 2019 17:24:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51161) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hWp0M-0007aC-Jh for guix-patches@gnu.org; Fri, 31 May 2019 17:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hWp0M-0008I7-FE for guix-patches@gnu.org; Fri, 31 May 2019 17:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35929] [PATCH 2/3] tests: hackage: Don't mock hackage-fetch. Resent-From: Robert Vollmert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 May 2019 21:24:02 +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.155933778531764 (code B ref 35929); Fri, 31 May 2019 21:24:02 +0000 Received: (at 35929) by debbugs.gnu.org; 31 May 2019 21:23:05 +0000 Received: from localhost ([127.0.0.1]:36471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWozQ-0008GB-L3 for submit@debbugs.gnu.org; Fri, 31 May 2019 17:23:04 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:30258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hWozN-0008ET-7O for 35929@debbugs.gnu.org; Fri, 31 May 2019 17:23:01 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 5E649A0AB0; Fri, 31 May 2019 23:22:55 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id Bgv9g8gEzOBM; Fri, 31 May 2019 23:22:48 +0200 (CEST) From: Robert Vollmert Date: Fri, 31 May 2019 23:22:42 +0200 Message-Id: <20190531212243.58302-2-rob@vllmrt.net> In-Reply-To: <20190531212243.58302-1-rob@vllmrt.net> References: <20190531212243.58302-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: Pass a string input port to tests instead of mocking hackage download. --- tests/hackage.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/hackage.scm b/tests/hackage.scm index 41e3b2dcd3..1b4800164e 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -186,12 +186,8 @@ library ('license 'bsd-3))) (define* (eval-test-with-cabal test-cabal matcher #:key (cabal-environment '())) - (mock - ((guix import hackage) hackage-fetch - (lambda (name-version) - (call-with-input-string test-cabal - read-cabal))) - (matcher (hackage->guix-package "foo" #:cabal-environment cabal-environment)))) + (define port (open-input-string test-cabal)) + (matcher (hackage->guix-package "foo" #:port port #:cabal-environment cabal-environment))) (test-assert "hackage->guix-package test 1" (eval-test-with-cabal test-cabal-1 match-ghc-foo))