summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Rüger <mrueg@gentoo.org>2016-11-09 00:14:04 +0100
committerManuel Rüger <mrueg@gentoo.org>2016-11-09 00:14:04 +0100
commit340c3aec732de7f8f1bac0dce62aff2f74b1bb86 (patch)
tree99e1483715d48b1e3efdddc5656600a51003760c /dev-ruby/fakeweb/files
parentsys-apps/tmpfiles: add live ebuild (diff)
downloadgentoo-340c3aec732de7f8f1bac0dce62aff2f74b1bb86.tar.gz
gentoo-340c3aec732de7f8f1bac0dce62aff2f74b1bb86.tar.bz2
gentoo-340c3aec732de7f8f1bac0dce62aff2f74b1bb86.zip
dev-ruby/fakeweb: Add ruby23
Package-Manager: portage-2.3.2
Diffstat (limited to 'dev-ruby/fakeweb/files')
-rw-r--r--dev-ruby/fakeweb/files/fakeweb-ruby23.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/dev-ruby/fakeweb/files/fakeweb-ruby23.patch b/dev-ruby/fakeweb/files/fakeweb-ruby23.patch
new file mode 100644
index 000000000000..0a1c6db6b3e7
--- /dev/null
+++ b/dev-ruby/fakeweb/files/fakeweb-ruby23.patch
@@ -0,0 +1,27 @@
+From c42a354eda2f6bfe8dc7c1176e085dda6867f4d0 Mon Sep 17 00:00:00 2001
+From: Christian Hofstaedtler <christian@hofstaedtler.name>
+Date: Thu, 3 Mar 2016 17:42:30 -0300
+Subject: [PATCH] Fix tests for ruby 2.3 (new connect_nonblock call)
+
+Applies on top of the changes for 2.2 (#53).
+---
+ test/test_helper.rb | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/test_helper.rb b/test/test_helper.rb
+index e9a36af..8ce492d 100644
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -119,7 +119,11 @@ def setup_expectations_for_real_request(options = {})
+ OpenSSL::SSL::SSLSocket.expects(:===).with(socket).returns(true).at_least_once
+ OpenSSL::SSL::SSLSocket.expects(:new).with(socket, instance_of(OpenSSL::SSL::SSLContext)).returns(socket).at_least_once
+ socket.stubs(:sync_close=).returns(true)
+- socket.expects(:connect).with().at_least_once
++ if RUBY_VERSION >= "2.3.0"
++ socket.expects(:connect_nonblock).with(:exception => false).at_least_once
++ else
++ socket.expects(:connect).with().at_least_once
++ end
+ if RUBY_VERSION >= "2.0.0" && RUBY_PLATFORM != "java"
+ socket.expects(:session).with().at_least_once
+ end