diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2010-08-08 13:43:50 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2010-08-08 13:43:50 +0000 |
| commit | 4e58b1f71b363d2d1f2f937302762aafbf662244 (patch) | |
| tree | 9d9fbbbc723eb66ecb0f83f037f4c254e2a0e4d0 /dev-ruby/eventmachine | |
| parent | Remove old versions. (diff) | |
| download | gentoo-2-4e58b1f71b363d2d1f2f937302762aafbf662244.tar.gz gentoo-2-4e58b1f71b363d2d1f2f937302762aafbf662244.tar.bz2 gentoo-2-4e58b1f71b363d2d1f2f937302762aafbf662244.zip | |
Fix failing test, bug 299782.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/eventmachine')
| -rw-r--r-- | dev-ruby/eventmachine/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild | 5 | ||||
| -rw-r--r-- | dev-ruby/eventmachine/files/eventmachine-0.12.10-https-test.patch | 22 |
3 files changed, 32 insertions, 2 deletions
diff --git a/dev-ruby/eventmachine/ChangeLog b/dev-ruby/eventmachine/ChangeLog index 1f5ea7e97869..230ee4fa9cf8 100644 --- a/dev-ruby/eventmachine/ChangeLog +++ b/dev-ruby/eventmachine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ruby/eventmachine # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/ChangeLog,v 1.13 2010/08/08 13:34:17 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/ChangeLog,v 1.14 2010/08/08 13:43:49 graaff Exp $ + + 08 Aug 2010; Hans de Graaff <graaff@gentoo.org> + eventmachine-0.12.10-r2.ebuild, + +files/eventmachine-0.12.10-https-test.patch: + Fix failing test, bug 299782. 08 Aug 2010; Hans de Graaff <graaff@gentoo.org> -eventmachine-0.12.10.ebuild, -eventmachine-0.12.10-r1.ebuild: diff --git a/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild b/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild index 0fc3f8742060..fd8165ac0efc 100644 --- a/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild +++ b/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild,v 1.3 2010/05/24 21:53:24 a3li Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild,v 1.4 2010/08/08 13:43:49 graaff Exp $ EAPI="2" # jruby → has shims for Java handling but tests fail badly, remaining @@ -31,6 +31,9 @@ all_ruby_prepare() { # fix tests on non-FreeBSD (where kqueue is missing) — sent upstream # fix building when git is not available — sent upstream epatch "${FILESDIR}/${P}-gentoo.patch" + + # Fix https test: bug 299782 + epatch "${FILESDIR}/${P}-https-test.patch" } each_ruby_configure() { diff --git a/dev-ruby/eventmachine/files/eventmachine-0.12.10-https-test.patch b/dev-ruby/eventmachine/files/eventmachine-0.12.10-https-test.patch new file mode 100644 index 000000000000..d589d71ce650 --- /dev/null +++ b/dev-ruby/eventmachine/files/eventmachine-0.12.10-https-test.patch @@ -0,0 +1,22 @@ +commit 63f2debff906a0f51bb807ac8f67c749d72b492d +Author: Michael S. Klishin <michael@novemberain.com> +Date: Sun May 23 21:09:03 2010 +0400 + + Makes HTTPS client tests pass + + https://www.amazon.com now redirects to http version. Switching site + is enough to make the test pass. + +diff --git a/tests/test_httpclient2.rb b/tests/test_httpclient2.rb +index ef72e7c..4705e42 100644 +--- a/tests/test_httpclient2.rb ++++ b/tests/test_httpclient2.rb +@@ -142,7 +142,7 @@ class TestHttpClient2 < Test::Unit::TestCase + def test_https_get + d = nil + EM.run { +- http = EM::P::HttpClient2.connect :host => 'www.amazon.com', :port => 443, :ssl => true ++ http = EM::P::HttpClient2.connect :host => 'www.apple.com', :port => 443, :ssl => true + d = http.get "/" + d.callback { + EM.stop |