[DRE-commits] [ruby-sawyer] 01/01: Fix FTBFS due to failing unit tests with encoding errors

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository ruby-sawyer.

commit 963937042de2b0a9616a4c059bd751b8422f2cdb
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Mon Jul 13 21:37:00 2015 -0300

    Fix FTBFS due to failing unit tests with encoding errors
---
 debian/changelog                                |  7 +++++++
 debian/control                                  | 13 +++++++++----
 debian/patches/01_fix_tests_encoding_issue.diff | 20 ++++++++++++--------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f734fa8..fdd53e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-sawyer (0.6.0-2) unstable; urgency=medium
+
+  * Fix FTBFS error due to failing unit tests with encoding errors.
+  * Wrap dependencies lists.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Mon, 13 Jul 2015 20:53:43 -0300
+
 ruby-sawyer (0.6.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 50e1450..f3d3eff 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,10 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Miguel Landaeta <nomadium at debian.org>
-Build-Depends: debhelper (>= 9~), gem2deb (>= 0.6.1~),
- ruby-faraday (>= 0.8~), ruby-addressable (>= 2.3.5~)
+Build-Depends: debhelper (>= 9~),
+               gem2deb (>= 0.6.1~),
+               ruby-faraday (>= 0.8~),
+               ruby-addressable (>= 2.3.5~)
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-sawyer.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-sawyer.git;a=summary
@@ -14,8 +16,11 @@ XS-Ruby-Versions: all
 Package: ruby-sawyer
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
- ruby-faraday (>= 0.8~), ruby-addressable (>= 2.3.5~)
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ruby | ruby-interpreter,
+         ruby-faraday (>= 0.8~),
+         ruby-addressable (>= 2.3.5~)
 Description: HTTP/REST API client Ruby library
  Sawyer is an experimental hypermedia HTTP client built on top of ruby-faraday.
  .
diff --git a/debian/patches/01_fix_tests_encoding_issue.diff b/debian/patches/01_fix_tests_encoding_issue.diff
index a69c28e..df2b59b 100644
--- a/debian/patches/01_fix_tests_encoding_issue.diff
+++ b/debian/patches/01_fix_tests_encoding_issue.diff
@@ -1,27 +1,31 @@
-Description: <short summary of the patch>
+Description: Fix failed unit tests due to encoding errors
 Author: Miguel Landaeta <nomadium at debian.org>
 Forwarded: no
-Last-Update: 2015-05-22
+Last-Update: 2015-07-13
 
---- ruby-sawyer-0.6.0.orig/test/relation_test.rb
-+++ ruby-sawyer-0.6.0/test/relation_test.rb
+diff --git a/test/relation_test.rb b/test/relation_test.rb
+index b11c14c..35a6ced 100644
+--- a/test/relation_test.rb
++++ b/test/relation_test.rb
 @@ -168,7 +168,7 @@ module Sawyer
        rel  = Sawyer::Relation.from_link(nil, :self, hash)
        map << rel
  
 -      assert_equal "{:self_url=>\"/users/1\"}\n", map.inspect
-+      assert_equal "{:self_url=>\"/users/1\"}\n", map.inspect.encode(Encoding::UTF_8)
++      assert_equal "{:self_url=>\"/users/1\"}".force_encoding("UTF-8"), map.inspect
      end
    end
  end
---- ruby-sawyer-0.6.0.orig/test/resource_test.rb
-+++ ruby-sawyer-0.6.0/test/resource_test.rb
+diff --git a/test/resource_test.rb b/test/resource_test.rb
+index f11b708..251ae60 100644
+--- a/test/resource_test.rb
++++ b/test/resource_test.rb
 @@ -180,7 +180,7 @@ module Sawyer
  
      def test_inspect
        resource = Resource.new @agent, :a => 1
 -      assert_equal "{:a=>1}\n", resource.inspect
-+      assert_equal "{:a=>1}\n", resource.inspect.encode(Encoding::UTF_8)
++      assert_equal "{:a=>1}".force_encoding("UTF-8"), resource.inspect
      end
  
      def test_each

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