| 1 |
commit: 8e7eb90c59e419c9467ce902243cb3fd3cd0f339 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Mar 1 17:29:23 2019 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 3 06:02:57 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7eb90c |
| 7 |
|
| 8 |
dev-ruby/fakeweb: remove unused patch(es) |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ruby/fakeweb/files/fakeweb-ruby22.patch | 24 ------------------------ |
| 14 |
dev-ruby/fakeweb/files/fakeweb-ruby23.patch | 27 --------------------------- |
| 15 |
2 files changed, 51 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ruby/fakeweb/files/fakeweb-ruby22.patch b/dev-ruby/fakeweb/files/fakeweb-ruby22.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 7c44aef6892..00000000000 |
| 20 |
--- a/dev-ruby/fakeweb/files/fakeweb-ruby22.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,24 +0,0 @@ |
| 23 |
-From 1647ca210691429a75eb159814f42e68c3c1ce4c Mon Sep 17 00:00:00 2001 |
| 24 |
-From: Josef Stribny <jstribny@××××××.com> |
| 25 |
-Date: Thu, 19 Mar 2015 09:32:50 +0100 |
| 26 |
-Subject: [PATCH] Fix tests by expecting TypeError for Ruby 2.2 |
| 27 |
- |
| 28 |
---- |
| 29 |
- test/test_fake_web.rb | 4 +++- |
| 30 |
- 1 file changed, 3 insertions(+), 1 deletion(-) |
| 31 |
- |
| 32 |
-diff --git a/test/test_fake_web.rb b/test/test_fake_web.rb |
| 33 |
-index f344612..682c43d 100644 |
| 34 |
---- a/test/test_fake_web.rb |
| 35 |
-+++ b/test/test_fake_web.rb |
| 36 |
-@@ -35,7 +35,9 @@ def test_response_for_with_wrong_number_of_arguments |
| 37 |
- end |
| 38 |
- |
| 39 |
- def test_register_uri_without_domain_name |
| 40 |
-- assert_raises URI::InvalidURIError do |
| 41 |
-+ # Ruby 2.1 and lower raises URI::InvalidURIError |
| 42 |
-+ # Ruby 2.2 and higher raises TypeError |
| 43 |
-+ assert_raises URI::InvalidURIError, TypeError do |
| 44 |
- FakeWeb.register_uri(:get, 'test_example2.txt', fixture_path("test_example.txt")) |
| 45 |
- end |
| 46 |
- end |
| 47 |
|
| 48 |
diff --git a/dev-ruby/fakeweb/files/fakeweb-ruby23.patch b/dev-ruby/fakeweb/files/fakeweb-ruby23.patch |
| 49 |
deleted file mode 100644 |
| 50 |
index 0a1c6db6b3e..00000000000 |
| 51 |
--- a/dev-ruby/fakeweb/files/fakeweb-ruby23.patch |
| 52 |
+++ /dev/null |
| 53 |
@@ -1,27 +0,0 @@ |
| 54 |
-From c42a354eda2f6bfe8dc7c1176e085dda6867f4d0 Mon Sep 17 00:00:00 2001 |
| 55 |
-From: Christian Hofstaedtler <christian@××××××××××××.name> |
| 56 |
-Date: Thu, 3 Mar 2016 17:42:30 -0300 |
| 57 |
-Subject: [PATCH] Fix tests for ruby 2.3 (new connect_nonblock call) |
| 58 |
- |
| 59 |
-Applies on top of the changes for 2.2 (#53). |
| 60 |
---- |
| 61 |
- test/test_helper.rb | 6 +++++- |
| 62 |
- 1 file changed, 5 insertions(+), 1 deletion(-) |
| 63 |
- |
| 64 |
-diff --git a/test/test_helper.rb b/test/test_helper.rb |
| 65 |
-index e9a36af..8ce492d 100644 |
| 66 |
---- a/test/test_helper.rb |
| 67 |
-+++ b/test/test_helper.rb |
| 68 |
-@@ -119,7 +119,11 @@ def setup_expectations_for_real_request(options = {}) |
| 69 |
- OpenSSL::SSL::SSLSocket.expects(:===).with(socket).returns(true).at_least_once |
| 70 |
- OpenSSL::SSL::SSLSocket.expects(:new).with(socket, instance_of(OpenSSL::SSL::SSLContext)).returns(socket).at_least_once |
| 71 |
- socket.stubs(:sync_close=).returns(true) |
| 72 |
-- socket.expects(:connect).with().at_least_once |
| 73 |
-+ if RUBY_VERSION >= "2.3.0" |
| 74 |
-+ socket.expects(:connect_nonblock).with(:exception => false).at_least_once |
| 75 |
-+ else |
| 76 |
-+ socket.expects(:connect).with().at_least_once |
| 77 |
-+ end |
| 78 |
- if RUBY_VERSION >= "2.0.0" && RUBY_PLATFORM != "java" |
| 79 |
- socket.expects(:session).with().at_least_once |
| 80 |
- end |
Archives