[DRE-commits] [ruby-nokogiri] 01/03: skip tests that won't work against libxml2 2.9.2 in Debian

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-nokogiri.

commit 117047aa09ddd6ae740828971fcd8552a8dad89b
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Nov 17 17:30:43 2015 -0200

    skip tests that won't work against libxml2 2.9.2 in Debian
---
 debian/changelog                     |  3 +++
 debian/patches/series                |  1 +
 debian/patches/skip-some-tests.patch | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 306788e..9fc136a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ ruby-nokogiri (1.6.6.3-1) UNRELEASED; urgency=medium
   * New upstream release
   * Refresh patches
   * switch running tests to debian/ruby-tests.rake
+  * skip-some-tests.patch: skip tests that won't work against libxml2 2.9.2 in
+    Debian, but pass when using the embedded copy + patches in the Nokogiri
+    tree.
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 17 Nov 2015 14:39:46 -0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 360827d..cc8e2e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove-annoying-warning.patch
 no-require-rubygems.patch
 deactivate_test_reader_blocking.patch
 always_use_system_libraries.patch
+skip-some-tests.patch
diff --git a/debian/patches/skip-some-tests.patch b/debian/patches/skip-some-tests.patch
new file mode 100644
index 0000000..736a981
--- /dev/null
+++ b/debian/patches/skip-some-tests.patch
@@ -0,0 +1,35 @@
+Description: skip tests that fail with Debian's libxml2
+Author: Antonio Terceiro <terceiro at debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2015-11-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/html/test_document.rb
++++ b/test/html/test_document.rb
+@@ -614,6 +614,7 @@ eohtml
+       end
+ 
+       def test_capturing_nonparse_errors_during_document_clone
++        skip 'Does not work against libxml2 2.9.2 in Debian'
+         # see https://github.com/sparklemotion/nokogiri/issues/1196 for background
+         original = Nokogiri::HTML.parse("<div id='unique'></div><div id='unique'></div>")
+         original_errors = original.errors.dup
+@@ -624,6 +625,7 @@ eohtml
+ 
+       def test_capturing_nonparse_errors_during_node_copy_between_docs
+         skip("JRuby HTML parse errors are different than libxml2's") if Nokogiri.jruby?
++        skip 'Does not work against libxml2 2.9.2 in Debian'
+ 
+         doc1 = Nokogiri::HTML("<div id='unique'>one</div>")
+         doc2 = Nokogiri::HTML("<div id='unique'>two</div>")
+--- a/test/html/test_document_fragment.rb
++++ b/test/html/test_document_fragment.rb
+@@ -279,6 +279,7 @@ module Nokogiri
+ 
+       def test_capturing_nonparse_errors_during_node_copy_between_fragments
+         skip("JRuby HTML parse errors are different than libxml2's") if Nokogiri.jruby?
++        skip("Does not work against libxml2 2.9.2 in Debian")
+ 
+         frag1 = Nokogiri::HTML.fragment("<div id='unique'>one</div>")
+         frag2 = Nokogiri::HTML.fragment("<div id='unique'>two</div>")

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