[gentoo-commits] repo/gentoo:master commit in: dev-ruby/fakeweb/files/

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/fakeweb/files/

[Hans de Graaff]

commit:     8e7eb90c59e419c9467ce902243cb3fd3cd0f339
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Mar  1 17:29:23 2019 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 06:02:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7eb90c

dev-ruby/fakeweb: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-ruby/fakeweb/files/fakeweb-ruby22.patch | 24 ------------------------
 dev-ruby/fakeweb/files/fakeweb-ruby23.patch | 27 ---------------------------
 2 files changed, 51 deletions(-)

diff --git a/dev-ruby/fakeweb/files/fakeweb-ruby22.patch b/dev-ruby/fakeweb/files/fakeweb-ruby22.patch
deleted file mode 100644
index 7c44aef6892..00000000000
--- a/dev-ruby/fakeweb/files/fakeweb-ruby22.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 1647ca210691429a75eb159814f42e68c3c1ce4c Mon Sep 17 00:00:00 2001
-From: Josef Stribny <jstribny@redhat.com>
-Date: Thu, 19 Mar 2015 09:32:50 +0100
-Subject: [PATCH] Fix tests by expecting TypeError for Ruby 2.2
-
----
- test/test_fake_web.rb | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/test/test_fake_web.rb b/test/test_fake_web.rb
-index f344612..682c43d 100644
---- a/test/test_fake_web.rb
-+++ b/test/test_fake_web.rb
-@@ -35,7 +35,9 @@ def test_response_for_with_wrong_number_of_arguments
-   end
- 
-   def test_register_uri_without_domain_name
--    assert_raises URI::InvalidURIError do
-+    # Ruby 2.1 and lower raises URI::InvalidURIError
-+    # Ruby 2.2 and higher raises TypeError
-+    assert_raises URI::InvalidURIError, TypeError do
-       FakeWeb.register_uri(:get, 'test_example2.txt', fixture_path("test_example.txt"))
-     end
-   end

diff --git a/dev-ruby/fakeweb/files/fakeweb-ruby23.patch b/dev-ruby/fakeweb/files/fakeweb-ruby23.patch
deleted file mode 100644
index 0a1c6db6b3e..00000000000
--- a/dev-ruby/fakeweb/files/fakeweb-ruby23.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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