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

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 1abedfe70b1ce0888bf61d818ab7aef9a5ebbe5b
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Thu May 24 20:48:40 2012 +0200

    Patch the tests so that they actually work/pass
    
    * debian/patches:
      + Added patch disable-config-tests.patch to disable config tests for
        which the input config does not actually exist.
      + Added patch fix-test-inheritance.patch to fix some tests that use
        inheritance but forget to require the parent test file.

diff --git a/debian/changelog b/debian/changelog
index 5c0cb34..dd7d38e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ ruby-net-ssh (1:2.5.1-1) UNRELEASED; urgency=low
     + Added a depend on ruby-test-unit; the one shipped with ruby1.8 is too
       old to run the tests.
   * debian/copyright: converted to the Debian copyright format version 1.0.
+  * debian/patches:
+    + Added patch disable-config-tests.patch to disable config tests for
+      which the input config does not actually exist.
+    + Added patch fix-test-inheritance.patch to fix some tests that use
+      inheritance but forget to require the parent test file.
 
  -- Paul van Tilburg <paulvt at debian.org>  Thu, 24 May 2012 20:15:46 +0200
 
diff --git a/debian/patches/disable-config-tests.patch b/debian/patches/disable-config-tests.patch
new file mode 100644
index 0000000..be6daa3
--- /dev/null
+++ b/debian/patches/disable-config-tests.patch
@@ -0,0 +1,20 @@
+--- a/test/test_config.rb
++++ b/test/test_config.rb
+@@ -39,7 +39,7 @@
+     assert !config.key?(:rekey_limit)
+   end
+   
+-  def test_load_with_no_host
++  def est_load_with_no_host
+     config = Net::SSH::Config.load(config(:nohost), "test.host")
+     assert_equal %w(~/.ssh/id_dsa ~/.ssh/id_rsa), config['identityfile']
+     assert_equal 1985, config['port']
+@@ -105,7 +105,7 @@
+     assert config['compression']
+   end
+   
+-  def test_load_with_numeric_host
++  def est_load_with_numeric_host
+     config = Net::SSH::Config.load(config(:numeric_host), "1234")
+     assert config['compression']
+     assert_equal '2G', config['rekeylimit']
diff --git a/debian/patches/fix-test-inheritance.patch b/debian/patches/fix-test-inheritance.patch
new file mode 100644
index 0000000..b5e6698
--- /dev/null
+++ b/debian/patches/fix-test-inheritance.patch
@@ -0,0 +1,25 @@
+--- a/test/transport/kex/test_diffie_hellman_group_exchange_sha256.rb
++++ b/test/transport/kex/test_diffie_hellman_group_exchange_sha256.rb
+@@ -1,5 +1,6 @@
+ require 'common'
+ require 'net/ssh/transport/kex/diffie_hellman_group_exchange_sha1'
++require 'transport/kex/test_diffie_hellman_group_exchange_sha1'
+ 
+ module Transport; module Kex
+ 
+--- a/test/transport/kex/test_ecdh_sha2_nistp384.rb
++++ b/test/transport/kex/test_ecdh_sha2_nistp384.rb
+@@ -1,4 +1,5 @@
+ require 'openssl'
++require 'transport/kex/test_ecdh_sha2_nistp256'
+ 
+ unless defined?(OpenSSL::PKey::EC)
+   puts "Skipping tests for ecdh-sha2-nistp384 key exchange"
+--- a/test/transport/kex/test_ecdh_sha2_nistp521.rb
++++ b/test/transport/kex/test_ecdh_sha2_nistp521.rb
+@@ -1,4 +1,5 @@
+ require 'openssl'
++require 'transport/kex/test_ecdh_sha2_nistp256'
+ 
+ unless defined?(OpenSSL::PKey::EC)
+   puts "Skipping tests for ecdh-sha2-nistp521 key exchange"
diff --git a/debian/patches/series b/debian/patches/series
index f015179..3cb2302 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 disable-test1.patch
+disable-config-tests.patch
 disable-rubygems-in-tests.patch
+fix-test-inheritance.patch

-- 
ruby-net-ssh.git