From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1ED2E138350 for ; Mon, 27 Apr 2020 07:17:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC5F7E0BC6; Mon, 27 Apr 2020 07:17:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF448E0BC6 for ; Mon, 27 Apr 2020 07:17:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1C5834FB28 for ; Mon, 27 Apr 2020 07:17:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8B011F6 for ; Mon, 27 Apr 2020 07:17:54 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1587971750.31aff268aa18182296a45dc1b8a2644b812bfed1.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/actionview/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/actionview/actionview-5.2.4.2.ebuild X-VCS-Directories: dev-ruby/actionview/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 31aff268aa18182296a45dc1b8a2644b812bfed1 X-VCS-Branch: master Date: Mon, 27 Apr 2020 07:17:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0a93e41d-334f-49b8-a531-7b712e64098e X-Archives-Hash: e3bc33926c8e9d68686cca5e9b571551 commit: 31aff268aa18182296a45dc1b8a2644b812bfed1 Author: Hans de Graaff gentoo org> AuthorDate: Mon Apr 27 07:07:09 2020 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Mon Apr 27 07:15:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31aff268 dev-ruby/actionview: avoid activerecord integration tests Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/actionview/actionview-5.2.4.2.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dev-ruby/actionview/actionview-5.2.4.2.ebuild b/dev-ruby/actionview/actionview-5.2.4.2.ebuild index 76df6e724c6..87622071e47 100644 --- a/dev-ruby/actionview/actionview-5.2.4.2.ebuild +++ b/dev-ruby/actionview/actionview-5.2.4.2.ebuild @@ -49,12 +49,13 @@ all_ruby_prepare() { -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die rm ../Gemfile.lock || die - # Avoid tests failing due to missing logger setup in activerecord, - # most likely related to test environment setup. - rm -f test/activerecord/render_partial_with_record_identification_test.rb || die - - sed -e '1igem "actionpack", "~> 5.2.0"' \ - -e '1igem "activemodel", "~> 5.2.0"' \ - -e '1igem "railties", "~> 5.2.0"' \ + # Avoid activerecord integration tests because they are very sensitive to the specifics + # of the environment. + sed -i -e 's/, "test:integration:active_record"//' Rakefile || die + + sed -e '2igem "actionpack", "~> 5.2.0"' \ + -e '2igem "activemodel", "~> 5.2.0"' \ + -e '2igem "railties", "~> 5.2.0"' \ + -e '/active_record/ s:^:#:' \ -i test/abstract_unit.rb || die }