[DRE-commits] [ruby-libxml] 06/07: Refresh patches

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-libxml.

commit 31f7ac80b59224aaf453cb5e404c583a880c592f
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Jul 2 21:04:31 2016 +0200

    Refresh patches
---
 debian/patches/avoid_infinite_loop_ruby22.patch  | 10 ++++-----
 debian/patches/avoid_messing_with_loadpath.patch |  4 ++--
 debian/patches/broken_tests.patch                | 26 ++++++++++--------------
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/debian/patches/avoid_infinite_loop_ruby22.patch b/debian/patches/avoid_infinite_loop_ruby22.patch
index dce2d36..3c9d4dc 100644
--- a/debian/patches/avoid_infinite_loop_ruby22.patch
+++ b/debian/patches/avoid_infinite_loop_ruby22.patch
@@ -3,11 +3,11 @@ Description: avoid that tests hang with ruby2.2
 Bug: https://github.com/xml4r/libxml-ruby/issues/106
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2015-06-21
+Last-Update: 2016-07-02
 
 --- a/test/tc_xpath.rb
 +++ b/test/tc_xpath.rb
-@@ -150,7 +150,7 @@
+@@ -149,7 +149,7 @@
      end
    end
  
@@ -16,7 +16,7 @@ Last-Update: 2015-06-21
      # This sometimes causes a segmentation fault because
      # an xml document is sometimes freed before the
      # xpath_object used to query it.  When the xpath_object
-@@ -242,4 +242,4 @@
+@@ -241,4 +241,4 @@
      assert_equal(1, nodes.length)
      assert_equal(nodes[0].content, ' my comment ')
    end
@@ -25,7 +25,7 @@ Last-Update: 2015-06-21
 +end
 --- a/test/tc_node_edit.rb
 +++ b/test/tc_node_edit.rb
-@@ -140,7 +140,7 @@
+@@ -138,7 +138,7 @@
    end
  
    # This test is to verify that an earlier reported bug has been fixed
@@ -34,7 +34,7 @@ Last-Update: 2015-06-21
      documents = []
  
      # Read in 500 documents
-@@ -173,4 +173,4 @@
+@@ -171,4 +171,4 @@
      assert_equal("<test xml:base=\"http://www.rubynet.org/\">\n  <num>one</num>\n  <num>two</num>\n  <num>three</num>\n</test>",
                   @doc.root.to_s)
    end
diff --git a/debian/patches/avoid_messing_with_loadpath.patch b/debian/patches/avoid_messing_with_loadpath.patch
index 39f8091..9f7f884 100644
--- a/debian/patches/avoid_messing_with_loadpath.patch
+++ b/debian/patches/avoid_messing_with_loadpath.patch
@@ -1,7 +1,7 @@
 Description: prevent loading the native extension for the wrong version of Ruby
  let gem2deb figure out the path where to find the right one
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2016-03-01
+Last-Update: 2016-07-02
 Forwarded: no
 --- a/test/test_helper.rb
 +++ b/test/test_helper.rb
@@ -15,4 +15,4 @@ Forwarded: no
 +#$LOAD_PATH << ext
  
  require 'xml'
- 
+ require 'minitest/autorun'
diff --git a/debian/patches/broken_tests.patch b/debian/patches/broken_tests.patch
index 7d73e91..8d650b5 100644
--- a/debian/patches/broken_tests.patch
+++ b/debian/patches/broken_tests.patch
@@ -2,12 +2,12 @@ Description: skip explicitly some tests
  test_get_handler is failing on i386
  test_double_parse results on ruby core dump on i386
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2015-03-03
+Last-Update: 2017-07-02
 Forwarded: no
 
 --- a/test/tc_error.rb
 +++ b/test/tc_error.rb
-@@ -59,7 +59,7 @@
+@@ -58,7 +58,7 @@
      assert_nil(exception)
    end
  
@@ -16,7 +16,7 @@ Forwarded: no
      assert_respond_to(XML::Error, :get_handler)
      assert_equal(0, XML::Error.method(:get_handler).arity)
  
-@@ -133,7 +133,7 @@
+@@ -132,7 +132,7 @@
      assert_nil(nil)
    end
  
@@ -27,20 +27,16 @@ Forwarded: no
      parser.parse
 --- a/test/tc_reader.rb
 +++ b/test/tc_reader.rb
-@@ -51,8 +51,10 @@
+@@ -49,7 +49,7 @@
+     assert_equal(expected, node_types)
    end
  
-   def test_document
--    reader = XML::Reader.document(XML::Document.file(XML_FILE))
--    verify_simple(reader)
-+    omit("randomly failing") do
-+      reader = XML::Reader.document(XML::Document.file(XML_FILE))
-+      verify_simple(reader)
-+    end
+-  def test_document
++  def _test_document
+     reader = XML::Reader.document(XML::Document.file(XML_FILE))
+     verify_simple(reader)
    end
- 
-   def test_file
-@@ -397,4 +399,4 @@
+@@ -396,4 +396,4 @@
      # Encoding is always null for strings, very annoying!
      assert_equal(reader.encoding, XML::Encoding::NONE)
    end
@@ -49,7 +45,7 @@ Forwarded: no
 +end
 --- a/test/test_suite.rb
 +++ b/test/test_suite.rb
-@@ -47,4 +47,4 @@
+@@ -46,4 +46,4 @@
  end
  # Compatibility
  require './tc_properties'

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