[DRE-commits] [SCM] ruby-net-http-persistent.git branch, master, updated. debian/2.7-1-1-g634c2bc

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 634c2bce384b96ce90ff906dd3df329ad46e0a1a
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Thu Aug 9 18:48:07 2012 -0500

    Skip the tests that require network connectivity to pass (Closes: #684421)

diff --git a/debian/changelog b/debian/changelog
index e1441b9..95ead9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-net-http-persistent (2.7-2) UNRELEASED; urgency=low
+
+  * Skip the tests that require network connectivity to pass (Closes:
+    #684421)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 09 Aug 2012 18:47:53 -0500
+
 ruby-net-http-persistent (2.7-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/series b/debian/patches/series
index 41638d5..61bca98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+skip_tests_requiring_net_connectivity
 workaround_persistent_ssl_reuse_failing_test.patch
diff --git a/debian/patches/skip_tests_requiring_net_connectivity b/debian/patches/skip_tests_requiring_net_connectivity
new file mode 100644
index 0000000..33d1eda
--- /dev/null
+++ b/debian/patches/skip_tests_requiring_net_connectivity
@@ -0,0 +1,28 @@
+Index: ruby-net-http-persistent/test/test_net_http_persistent.rb
+===================================================================
+--- ruby-net-http-persistent.orig/test/test_net_http_persistent.rb	2012-07-25 17:37:02.000000000 -0500
++++ ruby-net-http-persistent/test/test_net_http_persistent.rb	2012-08-09 18:45:55.000000000 -0500
+@@ -354,6 +354,7 @@
+   end
+ 
+   def test_connection_for_http_class_with_fakeweb
++    skip 'No network access can be assumed at Debian package build time'
+     Object.send :const_set, :FakeWeb, nil
+     c = @http.connection_for @uri
+     assert_instance_of Net::HTTP, c
+@@ -364,6 +365,7 @@
+   end
+ 
+   def test_connection_for_http_class_with_webmock
++    skip 'No network access can be assumed at Debian package build time'
+     Object.send :const_set, :WebMock, nil
+     c = @http.connection_for @uri
+     assert_instance_of Net::HTTP, c
+@@ -385,6 +387,7 @@
+   end
+ 
+   def test_connection_for_no_ssl_reuse
++    skip 'No network access can be assumed at Debian package build time'
+     @http.reuse_ssl_sessions = false
+     @http.open_timeout = 123
+     @http.read_timeout = 321

-- 
ruby-net-http-persistent.git