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 EDF8413832E for ; Sat, 23 Jul 2016 08:15:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5129AE0912; Sat, 23 Jul 2016 08:15:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E751E09D2 for ; Sat, 23 Jul 2016 08:15:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F53B340E8C for ; Sat, 23 Jul 2016 08:15:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6778CE9 for ; Sat, 23 Jul 2016 08:15:32 +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: <1469261674.ec66f0dcb1ec8506c49e8f7c265664aca7064665.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/webmock/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/webmock/webmock-1.20.3.ebuild X-VCS-Directories: dev-ruby/webmock/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: ec66f0dcb1ec8506c49e8f7c265664aca7064665 X-VCS-Branch: master Date: Sat, 23 Jul 2016 08:15:32 +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-Archives-Salt: 23368886-61b5-4434-948a-41a413640f07 X-Archives-Hash: ba3aa21aa7632e4cd9b3cbf81f5790a6 commit: ec66f0dcb1ec8506c49e8f7c265664aca7064665 Author: Hans de Graaff gentoo org> AuthorDate: Sat Jul 23 08:14:01 2016 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sat Jul 23 08:14:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec66f0dc dev-ruby/webmock: fix tests Package-Manager: portage-2.2.28 dev-ruby/webmock/webmock-1.20.3.ebuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev-ruby/webmock/webmock-1.20.3.ebuild b/dev-ruby/webmock/webmock-1.20.3.ebuild index aaf68ea..3d0c7e3 100644 --- a/dev-ruby/webmock/webmock-1.20.3.ebuild +++ b/dev-ruby/webmock/webmock-1.20.3.ebuild @@ -6,7 +6,7 @@ EAPI=5 USE_RUBY="ruby20 ruby21" -RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true" +RUBY_FAKEGEM_TASK_TEST="test NO_CONNECTION=true" RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" @@ -40,6 +40,11 @@ all_ruby_prepare() { # version is too old. sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die + sed -i -e '2i gem "http", "~>0.6.0"' spec/acceptance/http_gem/http_gem_spec.rb || die + + # Avoid test failing with newer httpclient versions + sed -i -e '/when a client instance is re-used for another identical request/,/^ end/ s:^:#:' \ + spec/acceptance/httpclient/httpclient_spec.rb } each_ruby_test() {