[DRE-commits] [ruby-eventmachine] 05/06: Refresh patches
zeha at debian.org
zeha at debian.org
Thu Apr 9 14:00:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
zeha pushed a commit to branch master
in repository ruby-eventmachine.
commit ba39271412062c0f148f491441b0124938023454
Author: Christian Hofstaedtler <zeha at debian.org>
Date: Thu Apr 9 15:57:30 2015 +0200
Refresh patches
---
debian/patches/skip_tests_using_network.patch | 73 ++++++++++++++-------------
1 file changed, 39 insertions(+), 34 deletions(-)
diff --git a/debian/patches/skip_tests_using_network.patch b/debian/patches/skip_tests_using_network.patch
index 6671348..3e86a4b 100644
--- a/debian/patches/skip_tests_using_network.patch
+++ b/debian/patches/skip_tests_using_network.patch
@@ -6,9 +6,11 @@ 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 @@
+Index: ruby-eventmachine/tests/test_basic.rb
+===================================================================
+--- ruby-eventmachine.orig/tests/test_basic.rb
++++ ruby-eventmachine/tests/test_basic.rb
+@@ -130,7 +130,7 @@ class TestBasic < Test::Unit::TestCase
assert_equal($sent, $received)
end
@@ -17,9 +19,11 @@ Last-Update: 2013-06-16
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 @@
+Index: ruby-eventmachine/tests/test_httpclient.rb
+===================================================================
+--- ruby-eventmachine.orig/tests/test_httpclient.rb
++++ ruby-eventmachine/tests/test_httpclient.rb
+@@ -13,7 +13,7 @@ class TestHttpClient < Test::Unit::TestC
#-------------------------------------
@@ -28,7 +32,7 @@ Last-Update: 2013-06-16
ok = false
EM.run {
c = silent { EM::P::HttpClient.send :request, :host => "www.google.com", :port => 80 }
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ class TestHttpClient < Test::Unit::TestC
#-------------------------------------
@@ -37,7 +41,7 @@ Last-Update: 2013-06-16
ok = false
EM.run {
c = silent { EM::P::HttpClient.send :request, :host => "www.google.com", :port => 80 }
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ class TestHttpClient < Test::Unit::TestC
#-------------------------------------
@@ -46,7 +50,7 @@ Last-Update: 2013-06-16
ok = false
EM.run {
c = silent { EM::P::HttpClient.send :request, :host => "www.google.com", :port => 80 }
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ class TestHttpClient < Test::Unit::TestC
# TODO, need a more intelligent cookie tester.
# In fact, this whole test-harness needs a beefier server implementation.
@@ -55,7 +59,7 @@ Last-Update: 2013-06-16
ok = false
EM.run {
c = silent { EM::Protocols::HttpClient.send :request, :host => "www.google.com", :port => 80, :cookie=>"aaa=bbb" }
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ class TestHttpClient < Test::Unit::TestC
# 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.
@@ -64,9 +68,11 @@ Last-Update: 2013-06-16
ok = false
EM.run {
c = silent { EM::P::HttpClient.request(
---- a/tests/test_httpclient2.rb
-+++ b/tests/test_httpclient2.rb
-@@ -51,7 +51,7 @@
+Index: ruby-eventmachine/tests/test_httpclient2.rb
+===================================================================
+--- ruby-eventmachine.orig/tests/test_httpclient2.rb
++++ ruby-eventmachine/tests/test_httpclient2.rb
+@@ -51,7 +51,7 @@ class TestHttpClient2 < Test::Unit::Test
assert(err)
end
@@ -75,7 +81,7 @@ Last-Update: 2013-06-16
content = nil
EM.run {
http = silent { EM::P::HttpClient2.connect "google.com", 80 }
-@@ -83,7 +83,7 @@
+@@ -83,7 +83,7 @@ class TestHttpClient2 < Test::Unit::Test
assert(content)
end
@@ -84,7 +90,7 @@ Last-Update: 2013-06-16
headers, headers2 = nil, nil
EM.run {
http = silent { EM::P::HttpClient2.connect "google.com", 80 }
-@@ -113,7 +113,7 @@
+@@ -113,7 +113,7 @@ class TestHttpClient2 < Test::Unit::Test
}
end
@@ -93,8 +99,10 @@ Last-Update: 2013-06-16
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
+Index: ruby-eventmachine/tests/test_resolver.rb
+===================================================================
+--- ruby-eventmachine.orig/tests/test_resolver.rb
++++ ruby-eventmachine/tests/test_resolver.rb
@@ -1,7 +1,7 @@
require 'em_test_helper'
@@ -104,7 +112,7 @@ Last-Update: 2013-06-16
EM.run {
d = EM::DNS::Resolver.resolve "google.com"
d.errback { assert false }
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ class TestResolver < Test::Unit::TestCas
}
end
@@ -113,25 +121,20 @@ Last-Update: 2013-06-16
EM.run {
d = EM::DNS::Resolver.resolve "asdfasasdf"
d.callback { assert false }
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ class TestResolver < Test::Unit::TestCas
}
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 @@
+ d = EM::DNS::Resolver.resolve "yahoo.com"
+ d.errback { |err| assert false, "failed to resolve yahoo.com: #{err}" }
+Index: ruby-eventmachine/tests/test_unbind_reason.rb
+===================================================================
+--- ruby-eventmachine.orig/tests/test_unbind_reason.rb
++++ ruby-eventmachine/tests/test_unbind_reason.rb
+@@ -11,7 +11,7 @@ class TestUnbindReason < Test::Unit::Tes
end
end
@@ -140,9 +143,11 @@ Last-Update: 2013-06-16
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 @@
+Index: ruby-eventmachine/tests/test_pending_connect_timeout.rb
+===================================================================
+--- ruby-eventmachine.orig/tests/test_pending_connect_timeout.rb
++++ ruby-eventmachine/tests/test_pending_connect_timeout.rb
+@@ -20,7 +20,7 @@ class TestPendingConnectTimeout < Test::
}
end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-eventmachine.git
More information about the Pkg-ruby-extras-commits
mailing list