[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 35c76ef9280a88fd4838e5f0f1d8e7002f5ec6f2
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Jul 2 15:31:27 2013 +0200

    Drop disable-config-tests.patch: The input config is now existing

diff --git a/debian/changelog b/debian/changelog
index 003e71d..df4a24c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ruby-net-ssh (1:2.6.7-1) UNRELEASED; urgency=low
     ruby 1.8
   * debian/patches:
     - Drop disable-test1.patch: The test is passing with ruby-test-unit 2.5.5
+    - Drop disable-config-tests.patch: The input config is now existing
 
  -- Laurent Bigonville <bigon at debian.org>  Tue, 02 Jul 2013 14:15:24 +0200
 
diff --git a/debian/patches/disable-config-tests.patch b/debian/patches/disable-config-tests.patch
deleted file mode 100644
index be6daa3..0000000
--- a/debian/patches/disable-config-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/series b/debian/patches/series
index 65be3bb..a3a906c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-disable-test1.patch
-disable-config-tests.patch
 disable-rubygems-in-tests.patch
 fix-test-inheritance.patch
 skip-test-broken-on-1.8.patch

-- 
ruby-net-ssh.git