[DRE-commits] [SCM] ruby-net-ssh.git branch, master, updated. debian/1%2.5.1-1-5-g146ff77

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit f1f123f924540f3ab92efb5f5bb0f95c96db1e52
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jun 12 16:29:01 2012 -0300

    Skip test that is broken on Ruby 1.8

diff --git a/debian/patches/series b/debian/patches/series
index 3cb2302..65be3bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ disable-test1.patch
 disable-config-tests.patch
 disable-rubygems-in-tests.patch
 fix-test-inheritance.patch
+skip-test-broken-on-1.8.patch
diff --git a/debian/patches/skip-test-broken-on-1.8.patch b/debian/patches/skip-test-broken-on-1.8.patch
new file mode 100644
index 0000000..a2c2b61
--- /dev/null
+++ b/debian/patches/skip-test-broken-on-1.8.patch
@@ -0,0 +1,17 @@
+Description: Skip test that is broken on Ruby 1.8
+Author: Antonio Terceiro <terceiro at debian.org>
+
+---
+
+--- ruby-net-ssh-2.5.2.orig/test/test_known_hosts.rb
++++ ruby-net-ssh-2.5.2/test/test_known_hosts.rb
+@@ -8,6 +8,6 @@ class TestKnownHosts < Test::Unit::TestC
+     keys = kh.keys_for("github.com")
+     assert_equal(1, keys.count)
+     assert_equal("ssh-rsa", keys[0].ssh_type)
+-  end
++  end if RUBY_VERSION > '1.9'
+ 
+-end
+\ No newline at end of file
++end

-- 
ruby-net-ssh.git