From patchwork Mon Mar 20 17:22:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48319 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 6BD6516F2D; Mon, 20 Mar 2023 17:29:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 E8D4316F1F for ; Mon, 20 Mar 2023 17:29:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJH8-0004Zc-Ak; Mon, 20 Mar 2023 13:26:26 -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 1peJH4-0004VE-K9 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:24 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peJH3-0005Ss-FN for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJH3-00042h-Ay for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:21 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 147/223] gnu: ruby-marcel: Enable tests. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:26:21 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62196@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 62196-submit@debbugs.gnu.org id=B62196.167933314714845 (code B ref 62196); Mon, 20 Mar 2023 17:26:21 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:25:47 +0000 Received: from localhost ([127.0.0.1]:56136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJGU-0003rN-Rj for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:25:47 -0400 Received: from mail-qv1-f51.google.com ([209.85.219.51]:43965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJFR-0003ds-89 for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:24:41 -0400 Received: by mail-qv1-f51.google.com with SMTP id jl13so8052640qvb.10 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:24:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333080; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YKuuQzKTdQOln2WkhmbLgcL6r8k3QCQ4/2Izgx0Foz8=; b=Z+RWOmVH5VgCa89eU0T8q7Qb+s23mNEUTTvf9cBO75ON/oO0ODI9iwX6VTFwkdBtqm 00tmYqF7siIv9SF8BTeLuXNXaSk4qzligVm6iOAbWnPONUlyToSgVeqcP724T5x3IvZB UE1O4oO13nZN4AKyv8RT98O/hV2fNDX1qiSdsmtPbfv9x1siRO3fgtWBI6pAhak/xuI7 H2/c2ei1pLWUOg+vurJdWaPdVnAxpt5YJ6yCxTh41m6UWPmE2RNXGMvJFz1rj6490L54 PuD+XfE6MRYyXfATyfLWnRZT5Wgc+unmG/eIwWyEJeAi+w3TMkcB6Y71dv68suPdObZQ W5Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333080; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YKuuQzKTdQOln2WkhmbLgcL6r8k3QCQ4/2Izgx0Foz8=; b=IIQf4rdi0XE9UI5FC+isRJODweY1zWV1l5XzUJt2UIP9YqrAnhuzL5lIzLNijQKsx0 w+ZIbcWGC78Ic+P0X0Jpyux1cWogLBNmEcKfcoEX1gZtqJbxfFvDPy0PoaYz2WPRzAzg mKvK6FsmiCBQGuTK7LXZ3eNs58CfJocXO9V2uzVurOjMYZjMeKrdrJckqA5qkjjPy1R7 eajwo4p1mVTXE+hBq8cY8TjF4CcWyBE6XCDfDyGv0b5f2F1rnTiY81HcCWX2WNd7x8lQ 1U01iDRmYYP10LM/Dol8FLNT3hOT1x2colCmDYQEFd9M7aGQmw4tN8u59YC8sxySN/pz LPfw== X-Gm-Message-State: AO0yUKXT3U5bK62Jdv7Jpk0HbvGJH4vXFKR+vGgHcvH3QiUyWXd6VZAO X2cCRrKz6AdFkQXmessix/wIDE/bL9Y= X-Google-Smtp-Source: AK7set+W8FblRKzdTZNA8d2lZJuLdxlmWlodEXv6xVmn6kQn0hgH8vCSgD1D3CoZvxSFgs0SlZuplA== X-Received: by 2002:ad4:5aac:0:b0:5ab:7b00:9b6e with SMTP id u12-20020ad45aac000000b005ab7b009b6emr43802790qvg.0.1679333080762; Mon, 20 Mar 2023 10:24:40 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id i7-20020a378607000000b007422eee8058sm7769352qkd.125.2023.03.20.10.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:24:40 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:22:33 -0400 Message-Id: <20230320172349.12752-46-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172349.12752-1-maxim.cournoyer@gmail.com> References: <20230320172349.12752-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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/rails.scm (ruby-marcel) [source]: Fetch from git. [arguments]: Drop #:tests?. Add #:phases. [native-inputs]: New field. --- gnu/packages/rails.scm | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 9638aee3ae..540c69ec2f 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -730,19 +730,30 @@ (define-public ruby-marcel (package (name "ruby-marcel") (version "1.0.2") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "marcel" version)) - (sha256 - (base32 - "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rails/marcel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1i1x24afmn09n48fj4yz2pdm6vlfnq14gism0cgxsyqmlrvsxajn")))) (build-system ruby-build-system) (arguments - '(;; No included tests - #:tests? #f)) - (propagated-inputs - (list ruby-mimemagic)) + (list #:test-target "default" + #:phases #~(modify-phases %standard-phases + (add-before 'check 'disable-problematic-tests + (lambda _ + (substitute* "test/mime_type_test.rb" + ;; One test fails because of the newer rack + ;; version used (see: + ;; https://github.com/rails/marcel/issues/91). + (("test \"gets content type.*" all) + (string-append + all " skip('fails on guix')\n")))))))) + (native-inputs (list ruby-byebug ruby-nokogiri ruby-rack)) + (propagated-inputs (list ruby-mimemagic)) (synopsis "MIME type detection using magic numbers, filenames and extensions") (description "@code{marcel} provides @acronym{MIME, Multipurpose Internet Mail