[DRE-commits] [SCM] ruby-net-ssh.git branch, master, updated. debian/1%2.5.2-2-14-g919d107

[Laurent Bigonville]

The following commit has been merged in the master branch:
commit 74de62e717937963daedd91eac0d947011a18b61
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Jul 2 14:55:54 2013 +0200

    debian/patches/skip-test-broken-on-1.8.patch: Also disable test_from_should_measure_bytesize_of_utf_8_string_correctly check with ruby 1.8

diff --git a/debian/changelog b/debian/changelog
index 23fb793..355f73a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ ruby-net-ssh (1:2.6.7-1) UNRELEASED; urgency=low
   * New upstream release
     - debian/patches/disable-rubygems-in-tests.patch: Refreshed
   * debian/control: Bump Standards-Version to 3.9.4 (no further changes)
+  * debian/patches/skip-test-broken-on-1.8.patch: Also disable
+    test_from_should_measure_bytesize_of_utf_8_string_correctly check with
+    ruby 1.8
 
  -- Laurent Bigonville <bigon at debian.org>  Tue, 02 Jul 2013 14:15:24 +0200
 
diff --git a/debian/patches/skip-test-broken-on-1.8.patch b/debian/patches/skip-test-broken-on-1.8.patch
index a2c2b61..42ac7f3 100644
--- a/debian/patches/skip-test-broken-on-1.8.patch
+++ b/debian/patches/skip-test-broken-on-1.8.patch
@@ -3,8 +3,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
+--- a/test/test_known_hosts.rb
++++ b/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)
@@ -15,3 +15,14 @@ Author: Antonio Terceiro <terceiro at debian.org>
 -end
 \ No newline at end of file
 +end
+--- a/test/test_buffer.rb
++++ b/test/test_buffer.rb
+@@ -32,7 +32,7 @@ class TestBuffer < Test::Unit::TestCase
+   def test_from_should_measure_bytesize_of_utf_8_string_correctly
+     buffer = Net::SSH::Buffer.from(:string, "\u2603") # Snowman is 3 bytes
+     assert_equal "\0\0\0\3\u2603", buffer.to_s
+-  end
++  end if RUBY_VERSION > '1.9'
+ 
+   def test_read_without_argument_should_read_to_end
+     buffer = new("hello world")

-- 
ruby-net-ssh.git