[DRE-commits] [SCM] ruby-eventmachine.git branch, master, updated. debian/0.12.10-3-22-g2d6c00c

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 2d6c00cf63bbffac528050a449f0c9d180a40d7d
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Jun 17 00:01:11 2013 +0200

    skip tests requiring network and prepare next Debian version

diff --git a/debian/changelog b/debian/changelog
index ea86a24..0cbdf85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-eventmachine (1.0.3-3) unstable; urgency=medium
+
+  * Team upload.
+  * Set urgency to medium as an RC bug is closed.
+  * Disable tests requiring network access. (Closes: #710941)
+    + add debian/patches/skip_tests_using_network.patch some of these tests
+    + skip entire test files from debian/ruby-tests.rb
+
+ -- Cédric Boutillier <boutil at debian.org>  Mon, 17 Jun 2013 00:17:18 +0200
+
 ruby-eventmachine (1.0.3-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4b9635e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+skip_tests_using_network.patch
diff --git a/debian/patches/skip_tests_using_network.patch b/debian/patches/skip_tests_using_network.patch
new file mode 100644
index 0000000..6671348
--- /dev/null
+++ b/debian/patches/skip_tests_using_network.patch
@@ -0,0 +1,153 @@
+Description: disable tests requiring network connection
+ These tests should pass if network access is available
+Bug-Debian: http://bugs.debian.org/710941
+Origin: vendor
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-06-16
+
+--- a/tests/test_basic.rb
++++ b/tests/test_basic.rb
+@@ -130,7 +130,7 @@
+     assert_equal($sent, $received)
+   end
+ 
+-  def test_bind_connect
++  def est_bind_connect
+     local_ip = UDPSocket.open {|s| s.connect('google.com', 80); s.addr.last }
+ 
+     bind_port = next_port
+--- a/tests/test_httpclient.rb
++++ b/tests/test_httpclient.rb
+@@ -13,7 +13,7 @@
+ 
+   #-------------------------------------
+ 
+-  def test_http_client
++  def est_http_client
+     ok = false
+     EM.run {
+       c = silent { EM::P::HttpClient.send :request, :host => "www.google.com", :port => 80 }
+@@ -28,7 +28,7 @@
+ 
+   #-------------------------------------
+ 
+-  def test_http_client_1
++  def est_http_client_1
+     ok = false
+     EM.run {
+       c = silent { EM::P::HttpClient.send :request, :host => "www.google.com", :port => 80 }
+@@ -40,7 +40,7 @@
+ 
+   #-------------------------------------
+ 
+-  def test_http_client_2
++  def est_http_client_2
+     ok = false
+     EM.run {
+       c = silent { EM::P::HttpClient.send :request, :host => "www.google.com", :port => 80 }
+@@ -155,7 +155,7 @@
+ 
+   # TODO, need a more intelligent cookie tester.
+   # In fact, this whole test-harness needs a beefier server implementation.
+-  def test_cookie
++  def est_cookie
+     ok = false
+     EM.run {
+       c = silent { EM::Protocols::HttpClient.send :request, :host => "www.google.com", :port => 80, :cookie=>"aaa=bbb" }
+@@ -170,7 +170,7 @@
+ 
+   # We can tell the client to send an HTTP/1.0 request (default is 1.1).
+   # This is useful for suppressing chunked responses until those are working.
+-  def test_version_1_0
++  def est_version_1_0
+     ok = false
+     EM.run {
+       c = silent { EM::P::HttpClient.request(
+--- a/tests/test_httpclient2.rb
++++ b/tests/test_httpclient2.rb
+@@ -51,7 +51,7 @@
+     assert(err)
+   end
+ 
+-  def test_get
++  def est_get
+     content = nil
+     EM.run {
+       http = silent { EM::P::HttpClient2.connect "google.com", 80 }
+@@ -83,7 +83,7 @@
+     assert(content)
+   end
+ 
+-  def test_get_pipeline
++  def est_get_pipeline
+     headers, headers2 = nil, nil
+     EM.run {
+       http = silent { EM::P::HttpClient2.connect "google.com", 80 }
+@@ -113,7 +113,7 @@
+     }
+   end
+ 
+-  def test_https_get
++  def est_https_get
+     d = nil
+     EM.run {
+       http = silent { EM::P::HttpClient2.connect :host => 'www.apple.com', :port => 443, :ssl => true }
+--- a/tests/test_resolver.rb
++++ b/tests/test_resolver.rb
+@@ -1,7 +1,7 @@
+ require 'em_test_helper'
+ 
+ class TestResolver < Test::Unit::TestCase
+-  def test_a
++  def est_a
+     EM.run {
+       d = EM::DNS::Resolver.resolve "google.com"
+       d.errback { assert false }
+@@ -12,7 +12,7 @@
+     }
+   end
+ 
+-  def test_bad_host
++  def est_bad_host
+     EM.run {
+       d = EM::DNS::Resolver.resolve "asdfasasdf"
+       d.callback { assert false }
+@@ -28,7 +28,7 @@
+     }
+   end
+ 
+-  def test_a_pair
++  def est_a_pair
+     EM.run {
+       d = EM::DNS::Resolver.resolve "google.com"
+       d.errback { assert false }
+@@ -52,4 +52,4 @@
+       }
+     }
+   end
+-end
+\ No newline at end of file
++end
+--- a/tests/test_unbind_reason.rb
++++ b/tests/test_unbind_reason.rb
+@@ -11,7 +11,7 @@
+     end
+   end
+ 
+-  def test_connect_timeout
++  def est_connect_timeout
+     error = nil
+     EM.run {
+       conn = EM.connect 'google.com', 81, Module.new{ |m|
+--- a/tests/test_pending_connect_timeout.rb
++++ b/tests/test_pending_connect_timeout.rb
+@@ -20,7 +20,7 @@
+       }
+     end
+ 
+-    def test_for_real
++    def est_for_real
+       start, finish = nil
+ 
+       timeout_handler = Module.new do
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index 6560512..5d20516 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,2 +1,12 @@
 $: << 'tests' 
-Dir['{tests}/**/*.rb'].each { |f| require f }
+
+# some tests requiring network access
+disabled_tests=[
+  'tests/test_idle_connection.rb',
+  'tests/test_get_sock_opt.rb',
+  'tests/test_set_sock_opt.rb',
+]
+
+
+
+(Dir['{tests}/**/*.rb']-disabled_tests).each { |f| require f }

-- 
ruby-eventmachine.git