[DRE-commits] [ruby-net-scp] 01/04: Add patch 0002-disable-assert_scripted-so-that-test-does-not-fail-b.patch

[Lucas Nussbaum]

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

lucas pushed a commit to branch master
in repository ruby-net-scp.

commit 4a8c631a5fa5d7137a4059325031c8178800ce1b
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Sat Jul 23 08:57:18 2016 +0200

    Add patch 0002-disable-assert_scripted-so-that-test-does-not-fail-b.patch
---
 ...ert_scripted-so-that-test-does-not-fail-b.patch | 43 ++++++++++++++++++++++
 debian/patches/disable-gem-in-tests.patch          | 15 +++++---
 debian/patches/series                              |  1 +
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0002-disable-assert_scripted-so-that-test-does-not-fail-b.patch b/debian/patches/0002-disable-assert_scripted-so-that-test-does-not-fail-b.patch
new file mode 100644
index 0000000..0eae3ac
--- /dev/null
+++ b/debian/patches/0002-disable-assert_scripted-so-that-test-does-not-fail-b.patch
@@ -0,0 +1,43 @@
+From: Lucas Nussbaum <lucas at debian.org>
+Date: Sat, 23 Jul 2016 08:54:26 +0200
+Subject: disable assert_scripted so that test does not fail because of
+ exception
+
+commit 982cbdc4d2294e479e370b97e695582d7e691643
+Author: Lucas Nussbaum <lucas.nussbaum at loria.fr>
+Date:   Sat Jul 23 08:46:42 2016 +0200
+Forwarded: https://github.com/net-ssh/net-scp/pull/28
+
+    Test should not fail because of exception raised
+
+    Since commit 4b36d0c08fc55d45ca4025daf4bad5c8349efcb4 in net-ssh, this
+    test fails. Since an exception is raised in the middle of the story, the
+    last steps are not processed, and assert_scripted fails.
+
+    Given an exception is raised in the middle of exception, it is expected
+    that the story cannot finish completely.
+---
+ test/test_download.rb | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/test/test_download.rb b/test/test_download.rb
+index f3f9a14..1fa33a0 100644
+--- a/test/test_download.rb
++++ b/test/test_download.rb
+@@ -70,12 +70,10 @@ class TestDownload < Net::SCP::TestCase
+     end
+ 
+     error = nil
+-    assert_scripted do
+-      begin
+-        scp.download!("/path/to/remote.txt")
+-      rescue
+-        error = $!
+-      end
++    begin
++      scp.download!("/path/to/remote.txt")
++    rescue
++      error = $!
+     end
+     assert_equal Net::SCP::Error, error.class
+     assert_equal "SCP did not finish successfully (1): File not found: /path/to/remote.txt\n", error.message
diff --git a/debian/patches/disable-gem-in-tests.patch b/debian/patches/disable-gem-in-tests.patch
index f079a1d..a4b7b48 100644
--- a/debian/patches/disable-gem-in-tests.patch
+++ b/debian/patches/disable-gem-in-tests.patch
@@ -1,9 +1,14 @@
-Description: Disable rubygem in tests
-Forwarded: no
-Author: Lucas Nussbaum <lucas at debian.org>
-Reviewed-By: Sebastien Badia <seb at sebian.fr>
-Last-Update: 2015-04-10
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Sat, 23 Jul 2016 08:51:06 +0200
+Subject: disable-gem-in-tests
 
+---
+ test/common.rb | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/common.rb b/test/common.rb
+index 1216933..1950cb2 100644
 --- a/test/common.rb
 +++ b/test/common.rb
 @@ -1,11 +1,11 @@
diff --git a/debian/patches/series b/debian/patches/series
index b50efae..1b9df44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable-gem-in-tests.patch
+0002-disable-assert_scripted-so-that-test-does-not-fail-b.patch

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