[DRE-commits] [ruby-webmock] 03/04: drop skip-excon-incompatible-test.patch and deactivate_tests_with_network.patch; not needed anymore

[Cédric Boutillier]

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

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

commit 5d039c860dfc912eb9956e35d1d518f70334f236
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Sep 30 23:16:25 2014 +0200

    drop skip-excon-incompatible-test.patch and deactivate_tests_with_network.patch; not needed anymore
---
 debian/patches/deactivate_tests_with_network.patch | 36 ----------------------
 debian/patches/series                              |  4 +--
 debian/patches/skip-excon-incompatible-test.patch  | 16 ----------
 3 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/debian/patches/deactivate_tests_with_network.patch b/debian/patches/deactivate_tests_with_network.patch
deleted file mode 100644
index ad67f31..0000000
--- a/debian/patches/deactivate_tests_with_network.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: deactive tests requiring network access
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: not-needed
-Last-Update: 2013-05-24
-
---- a/spec/acceptance/excon/excon_spec.rb
-+++ b/spec/acceptance/excon/excon_spec.rb
-@@ -17,7 +17,7 @@
-   end
- 
-   context "with response_block" do
--    it "should support excon response_block for real requests" do
-+    xit "should support excon response_block for real requests" do
-       a = []
-       WebMock.allow_net_connect!
-       r = Excon.new('http://httpstat.us/200').get(:response_block => lambda {|e, remaining, total| a << e}, :chunk_size => 1)
-@@ -33,7 +33,7 @@
-       r.body.should == ""
-     end
- 
--    it "should invoke callbacks with response body even if a real request is made" do
-+    xit "should invoke callbacks with response body even if a real request is made" do
-       a = []
-       WebMock.allow_net_connect!
-       response = nil
---- a/spec/acceptance/httpclient/httpclient_spec.rb
-+++ b/spec/acceptance/httpclient/httpclient_spec.rb
-@@ -135,7 +135,7 @@
-       HTTPClient.new(:agent_name => user_agent).get("www.example.com")
-     end
- 
--    it "client sends the Accept, User-Agent, and Date by default" do
-+    xit "client sends the Accept, User-Agent, and Date by default" do
-       stub_request(:get, "www.example.com").with do |req|
-         req.headers["Accept"].should == "*/*"
-         req.headers["User-Agent"].should == "#{HTTPClient::DEFAULT_AGENT_NAME} #{HTTPClient::LIB_NAME}"
diff --git a/debian/patches/series b/debian/patches/series
index 1f9e768..9e1cd45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 remove-rubygems-curb-version-check.patch
 skip-gem-building-whitespace-tests.patch
-deactivate_tests_with_network.patch
-skip-excon-incompatible-test.patch
+#deactivate_tests_with_network.patch
+#skip-excon-incompatible-test.patch
 remove-patron.patch
diff --git a/debian/patches/skip-excon-incompatible-test.patch b/debian/patches/skip-excon-incompatible-test.patch
deleted file mode 100644
index 2e41a78..0000000
--- a/debian/patches/skip-excon-incompatible-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: this test is tied to an older version of excon
- so skip this test
-Forwarded: yes
-Bug-Upstream: https://github.com/bblimke/webmock/issues/359
-
---- a/spec/acceptance/excon/excon_spec.rb
-+++ b/spec/acceptance/excon/excon_spec.rb
-@@ -25,7 +25,7 @@
-       r.body.should == ""
-     end
- 
--    it "should support excon response_block" do
-+    xit "should support excon response_block" do
-       a = []
-       stub_request(:get, "http://example.com/").to_return(:body => "abc")
-       r = Excon.new('http://example.com').get(:response_block => lambda {|e, remaining, total| a << e}, :chunk_size => 1)

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