[DRE-commits] [ruby-net-ssh] 02/03: Revert "Drop fix-test-inheritance.patch: Tests are running as expected now"

[David Suárez]

This is an automated email from the git hooks/post-receive script.

deiv-guest pushed a commit to branch master
in repository ruby-net-ssh.

commit 770a76915e7abb937c47c46d68763c3c1808b000
Author: David Suárez <david.sephirot at gmail.com>
Date:   Tue Jul 30 21:10:39 2013 +0200

    Revert "Drop fix-test-inheritance.patch: Tests are running as expected now"
    
    Test are still failing.
---
 debian/changelog                          |    1 -
 debian/patches/fix-test-inheritance.patch |   25 +++++++++++++++++++++++++
 debian/patches/series                     |    1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 46d4b3b..c9cbff4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,6 @@ ruby-net-ssh (1:2.6.7-1) unstable; urgency=low
   * 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
-    - Drop fix-test-inheritance.patch: Tests are running as expected now
 
  -- Laurent Bigonville <bigon at debian.org>  Sat, 06 Jul 2013 21:04:36 +0200
 
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 843ff73..a3a906c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable-rubygems-in-tests.patch
+fix-test-inheritance.patch
 skip-test-broken-on-1.8.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-net-ssh.git