[DRE-commits] [SCM] ruby-net-sftp.git branch, bug-674324, updated. upstream/2.0.5-5-gfc6be51

[Cédric Boutillier]

The following commit has been merged in the bug-674324 branch:
commit fc6be517dc4c34afe4c0d58a6e4df10a002b047c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Oct 16 10:56:08 2012 +0200

    Comment problematic test with newer versions of mocha + release. Closes: #674324

diff --git a/debian/changelog b/debian/changelog
index 79f7b9e..0aa3be4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ruby-net-sftp (1:2.0.5-3) unstable; urgency=medium
+
+  * Team upload.
+  * Set urgency to medium, as this upload fixes an RC bug.
+  * Add debian/patches/disable_test_triggering_mocha_bug_690562.patch
+    to disable a test which, due to a bug in ruby-mocha, causes other tests
+    to fail, yielding a FTBFS (Closes: #674324).
+  * Ease upgrade from Squeeze libnet-sftp2-ruby* packages
+    + replace Conflicts: by Breaks:
+    + set priority of transitional packages to extra
+
+ -- Cédric Boutillier <boutil at debian.org>  Mon, 15 Oct 2012 22:16:06 +0200
+
 ruby-net-sftp (1:2.0.5-2) unstable; urgency=low
 
   * Add epoch to version in order to properly override the previous
diff --git a/debian/control b/debian/control
index 503a1e6..03603e9 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-net-ssh
 Replaces: libnet-sftp-ruby1.8 (<< 2.0.5-1~), libnet-sftp2-ruby (<< 2.0.5-1~), libnet-sftp2-ruby1.8 (<< 2.0.5-1~), libnet-sftp2-ruby1.9.1 (<< 2.0.5-1~)
-Conflicts: libnet-sftp-ruby1.8 (<< 2.0.5-1~), libnet-sftp2-ruby (<< 2.0.5-1~), libnet-sftp2-ruby1.8 (<< 2.0.5-1~), libnet-sftp2-ruby1.9.1 (<< 2.0.5-1~)
+Breaks: libnet-sftp-ruby1.8 (<< 2.0.5-1~), libnet-sftp2-ruby (<< 2.0.5-1~), libnet-sftp2-ruby1.8 (<< 2.0.5-1~), libnet-sftp2-ruby1.9.1 (<< 2.0.5-1~)
 Provides: libnet-sftp-ruby1.8, libnet-sftp2-ruby, libnet-sftp2-ruby1.8, libnet-sftp2-ruby1.9.1
 Description: Ruby implementation of the SFTP protocol
  Net::SFTP is a pure-Ruby implementation of the SFTP protocol (specifically,
@@ -26,6 +26,7 @@ Description: Ruby implementation of the SFTP protocol
 
 Package: libnet-sftp-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-net-sftp
 Description: Transitional package for ruby-net-sftp
@@ -34,6 +35,7 @@ Description: Transitional package for ruby-net-sftp
 
 Package: libnet-sftp2-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-net-sftp
 Description: Transitional package for ruby-net-sftp
@@ -42,6 +44,7 @@ Description: Transitional package for ruby-net-sftp
 
 Package: libnet-sftp2-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-net-sftp
 Description: Transitional package for ruby-net-sftp
@@ -50,6 +53,7 @@ Description: Transitional package for ruby-net-sftp
 
 Package: libnet-sftp2-ruby1.9.1
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-net-sftp
 Description: Transitional package for ruby-net-sftp
diff --git a/debian/patches/disable_test_triggering_mocha_bug_690562.patch b/debian/patches/disable_test_triggering_mocha_bug_690562.patch
new file mode 100644
index 0000000..59d23bb
--- /dev/null
+++ b/debian/patches/disable_test_triggering_mocha_bug_690562.patch
@@ -0,0 +1,26 @@
+Description: disable test causing FTBS because of a regression in ruby-mocha
+ After the expects call, :from_buffer method is not completely restored and
+ does not return objects from the correct class when applied to children
+ classes.
+Author: Cédric Boutillier <boutil at debian.org>
+Bug: http://net-ssh.lighthouseapp.com/projects/36253-net-ssh/tickets/62-net-sftp-fails-with-mocha-0113
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674324
+Last-Update: 2012-10-15
+
+--- a/test/protocol/01/test_base.rb
++++ b/test/protocol/01/test_base.rb
+@@ -33,10 +33,10 @@
+     assert_equal({ :data => "here is a string" }, @base.parse_data_packet(packet))
+   end
+ 
+-  def test_parse_attrs_packet_should_use_correct_attributes_class
+-    Net::SFTP::Protocol::V01::Attributes.expects(:from_buffer).with(:packet).returns(:result)
+-    assert_equal({ :attrs => :result }, @base.parse_attrs_packet(:packet))
+-  end
++#  def test_parse_attrs_packet_should_use_correct_attributes_class
++#    Net::SFTP::Protocol::V01::Attributes.expects(:from_buffer).with(:packet).returns(:result)
++#    assert_equal({ :attrs => :result }, @base.parse_attrs_packet(:packet))
++#  end
+ 
+   def test_parse_name_packet_should_use_correct_name_class
+     packet = Net::SSH::Buffer.from(:long, 2,
diff --git a/debian/patches/series b/debian/patches/series
index b50efae..a4838fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable-gem-in-tests.patch
+disable_test_triggering_mocha_bug_690562.patch

-- 
ruby-net-sftp.git