From patchwork Mon Mar 20 17:29:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48360 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 388F516F2D; Mon, 20 Mar 2023 17:31:20 +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 91A3B16F49 for ; Mon, 20 Mar 2023 17:31:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJLL-00022H-6y; Mon, 20 Mar 2023 13:30:47 -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 1peJKm-0000yY-Ic for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:15 -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 1peJKl-0007PE-H3 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJKl-0004m2-6k for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 211/223] gnu: ruby-parallel-tests: Update to 4.2.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:30:11 +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.167933340818296 (code B ref 62196); Mon, 20 Mar 2023 17:30:11 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:30:08 +0000 Received: from localhost ([127.0.0.1]:56384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKh-0004ko-UT for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:30:08 -0400 Received: from mail-qv1-f52.google.com ([209.85.219.52]:33629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKU-0004gY-Kl for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:29:54 -0400 Received: by mail-qv1-f52.google.com with SMTP id m6so8105383qvq.0 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333389; 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=eXogvW+01rsapmRh7Eus7iRS5YZjdljie+xcV+MOFgs=; b=EzQgz3uEuVdruxSbm4/1PFwMi0TTwPAwfF5lcke6P7SWmvTIqB1+o+DRgLKUQK5Ewc 5unVOrhkBlnkLfNNbE3tlyCtZNWrPRQEZU3BbA+PaTUfgrqip8vsNtXeuMKnSNwGQiVw fvYvtMBmHdPTAM3nMz2TfyDadOQ9PNrc0vggAurllgFqTUxp9R5OBs5KjR+SMXoOveb6 m13b9UezGqGV1GAtQiKEDAj3AQycRQn/7b+XMH7QfWgQGntqUK7fJWmaKYhK23DYKhGa hUZn5KFQwxqpJUtRbUoWa5ZJl6YIRH+fpsaawB/PZ7GcperQFuNRPuNV4XPsCdm6wl+d 359A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333389; 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=eXogvW+01rsapmRh7Eus7iRS5YZjdljie+xcV+MOFgs=; b=otylva7Ux51za0vsPplr2psWPlD2XzSlQn6f6TPwx7zVB5nSeZ7tfmOv6cBRDcgEvd jz50eWuq8UYwsqsRjA/9bb2XZm305RWhWqlLhJpiMjnMo1F8B2aYNcdf0u0824DEBubv G9cLxapozGtUD9Qe9+8NWfAEySEjtTi2VFnTH8B5JSyDo/uWZd0MJD+sF4ufgVAgCUaK Il3N3EMPKlx7yBSKvFEifN3Y11bJwfA6NrNlWmIrxMrOoL+gPMbO0aunAEY/eV9l0enw EYir2iij/ZjhRuETeSHpMuYHW2qDdosyyPNLr5tQoNegn9lUnjeny7cPnywH4Y3xmzxO f6oA== X-Gm-Message-State: AO0yUKWJHY3p8YJQwbpkWqbyT2mG9Y7OAfcsIMbJDPT5eSfdZrchACD5 A5BuwVxsshgrpQ1559g8nnMFm/7DkNE= X-Google-Smtp-Source: AK7set/hgiQFh0cXnPPpbf+Li5lF6ZKiPSqRVdk5gYjhzp7S5MmmTKb2T6KrKzpkge9F47mvEbYOEQ== X-Received: by 2002:a05:6214:48e:b0:56e:a4c5:9d9d with SMTP id pt14-20020a056214048e00b0056ea4c59d9dmr58434271qvb.22.1679333389051; Mon, 20 Mar 2023 10:29:49 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id g2-20020a37b602000000b0071aacb2c76asm7536708qkf.132.2023.03.20.10.29.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:29:48 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:29:21 -0400 Message-Id: <20230320172933.13101-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172933.13101-1-maxim.cournoyer@gmail.com> References: <20230320172933.13101-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/ruby.scm (ruby-parallel-tests): Update to 4.2.0. [arguments]: Delete trailing #t. Use "spec" as the #:test-target. Rename remove-version-constraints phase to relax-requirements, and update it. Add disable-problematic-tests phase. --- gnu/packages/ruby.scm | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 52dcc08b80..f8d0941e26 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6382,7 +6382,7 @@ (define-public ruby-cuke-modeler (define-public ruby-parallel-tests (package (name "ruby-parallel-tests") - (version "3.0.0") + (version "4.2.0") (home-page "https://github.com/grosser/parallel_tests") (source (origin (method git-fetch) @@ -6392,19 +6392,18 @@ (define-public ruby-parallel-tests (file-name (string-append name version)) (sha256 (base32 - "08a6ndqn2dqacmc7yg48k0dh2rfrynvhkd5hiay16dl9m1r9q8pz")))) + "00gbg5q36ayspkzd6r0kg4gk46lsw9s6misx14rczxaf9kqcdrmv")))) (build-system ruby-build-system) (arguments - '(#:test-target "default" + '(#:test-target "spec" ;avoid rubocop dependency #:phases (modify-phases %standard-phases (add-after 'patch-source-shebangs 'patch-shell-invokations (lambda _ (substitute* '("lib/parallel_tests/tasks.rb" "spec/parallel_tests/tasks_spec.rb") (("/bin/sh") (which "sh")) - (("/bin/bash") (which "bash"))) - #t)) - (add-before 'check 'remove-version-constraints + (("/bin/bash") (which "bash"))))) + (add-before 'check 'relax-requirements (lambda _ ;; Remove hard coded version constraints, instead just ;; use whatever versions are available in Guix. @@ -6413,20 +6412,27 @@ (define-public ruby-parallel-tests (("'minitest',.*") "'minitest'\n") (("'cucumber',.*") - "'cucumber'\n")) - #t)) + "'cucumber'\n") + ;; Do not depend on a git-fetched spinach version. + (("gem 'spinach',.*") + "gem 'spinach'\n") + ((".*rubocop.*") "")))) (add-before 'check 'disable-rails-test (lambda _ ;; XXX: This test attempts to download and run the test ;; suites of multiple Rails versions(!) directly. - (delete-file "spec/rails_spec.rb") - #t)) + (delete-file "spec/rails_spec.rb"))) + (add-before 'check 'disable-problematic-tests + (lambda _ + ;; This test fails, probably because of the newer + ;; Cucumber version used here. + (delete-file "spec/parallel_tests/cucumber/\ +failure_logger_spec.rb") )) (add-before 'check 'set-HOME (lambda _ ;; Some tests check the output of Bundler, and fail when ;; Bundler warns that /homeless-shelter does not exist. - (setenv "HOME" "/tmp") - #t))))) + (setenv "HOME" "/tmp")))))) (native-inputs (list ruby-bump ruby-cucumber