[DRE-commits] [ruby-webmock] 02/05: remove patron from lib/webmock.rb as well

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-webmock.

commit 17443cc764951a3a0d1313f84ab5ced6d529c709
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed May 21 11:31:38 2014 +0530

    remove patron from lib/webmock.rb as well
---
 debian/patches/remove-patron.patch             | 16 ++++++++++++++++
 debian/patches/series                          |  1 +
 debian/patches/skip-patron-segfault-test.patch | 16 ----------------
 debian/ruby-tests.rake                         |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/debian/patches/remove-patron.patch b/debian/patches/remove-patron.patch
new file mode 100644
index 0000000..d4b11fd
--- /dev/null
+++ b/debian/patches/remove-patron.patch
@@ -0,0 +1,16 @@
+Description: Remove patron adapter
+ patron is unmaintained and removed from testing due to ftbfs.
+Author: Pirate Praveen <praveen at debian.org>
+Last-Updated: 2014-05-20
+
+--- a/lib/webmock.rb
++++ b/lib/webmock.rb
+@@ -40,7 +40,7 @@
+ require 'webmock/http_lib_adapters/net_http'
+ require 'webmock/http_lib_adapters/http_gem_adapter'
+ require 'webmock/http_lib_adapters/httpclient_adapter'
+-require 'webmock/http_lib_adapters/patron_adapter'
++#require 'webmock/http_lib_adapters/patron_adapter'
+ require 'webmock/http_lib_adapters/curb_adapter'
+ require 'webmock/http_lib_adapters/em_http_request_adapter'
+ require 'webmock/http_lib_adapters/typhoeus_hydra_adapter'
diff --git a/debian/patches/series b/debian/patches/series
index be1633d..dbdd4e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ skip-gem-building-whitespace-tests.patch
 deactivate_tests_with_network.patch
 skip-patron-segfault-test.patch
 skip-excon-incompatible-test.patch
+remove-patron.patch
diff --git a/debian/patches/skip-patron-segfault-test.patch b/debian/patches/skip-patron-segfault-test.patch
deleted file mode 100644
index 306c760..0000000
--- a/debian/patches/skip-patron-segfault-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: skip the failing patron test for now
- we'll need to investigate it further
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Forwarded: no
-Last-Update: 2013-05-26
-
---- a/spec/acceptance/patron/patron_spec.rb
-+++ b/spec/acceptance/patron/patron_spec.rb
-@@ -39,6 +39,7 @@
-         end
- 
-         it "should raise same error as Patron if file is not readable for get request" do
-+				pending "patron causes ruby segfault, skiping..."
-           stub_request(:get, "www.example.com")
-           File.open("/tmp/read_only_file", "w") do |tmpfile|
-             tmpfile.chmod(0400)
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 1b7e94e..6e3d723 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,7 +1,7 @@
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
-  t.pattern = FileList["spec/**/*_spec.rb"].exclude("spec/integration/patron/*")
+  t.pattern = FileList["spec/**/*_spec.rb"].exclude("spec/acceptance/patron/*")
 end
 
 RSpec::Core::RakeTask.new(:spec_http_without_webmock) do |t|

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