[DRE-commits] [ruby-fakeweb] 01/04: Follow ruby 2.3 behaviour changes, fixes FTBFS

[zeha at debian.org]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository ruby-fakeweb.

commit f56f86d622f39e931d449a540d9c146ebf3f427a
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Mar 3 21:39:04 2016 +0100

    Follow ruby 2.3 behaviour changes, fixes FTBFS
---
 debian/patches/ruby23.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/ruby23.patch b/debian/patches/ruby23.patch
new file mode 100644
index 0000000..0a1c6db
--- /dev/null
+++ b/debian/patches/ruby23.patch
@@ -0,0 +1,27 @@
+From c42a354eda2f6bfe8dc7c1176e085dda6867f4d0 Mon Sep 17 00:00:00 2001
+From: Christian Hofstaedtler <christian at 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
diff --git a/debian/patches/series b/debian/patches/series
index 9ffb58f..7253fdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ ruby22.patch
 no_bundler_simplecov.patch
 fix_print_file_string_options_deprecation_warning.patch
 deactivate_google_tests.patch
+ruby23.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-fakeweb.git