[DRE-commits] [ruby-zip] 03/07: Add 'fix-random-tests-failures' patch from upstream

[David Suárez]

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

deiv-guest pushed a commit to branch master
in repository ruby-zip.

commit 10f419bc1d20623d03ceb57496631a0aa3bef142
Author: David Suárez <david.sephirot at gmail.com>
Date:   Tue Sep 23 20:31:55 2014 +0200

    Add 'fix-random-tests-failures' patch from upstream
---
 debian/patches/fix-random-tests-failures | 58 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 2 files changed, 59 insertions(+)

diff --git a/debian/patches/fix-random-tests-failures b/debian/patches/fix-random-tests-failures
new file mode 100644
index 0000000..afc22d5
--- /dev/null
+++ b/debian/patches/fix-random-tests-failures
@@ -0,0 +1,58 @@
+Description: Fix random tests failures
+
+Origin: upstream, https://github.com/rubyzip/rubyzip/commit/96f84aee4c575a0c886462abb809ef47e2866f94
+Last-Update: 2014-09-23
+
+--- ruby-zip-1.1.6.orig/test/central_directory_test.rb
++++ ruby-zip-1.1.6/test/central_directory_test.rb
+@@ -2,6 +2,10 @@ require 'test_helper'
+ 
+ class ZipCentralDirectoryTest < MiniTest::Unit::TestCase
+ 
++  def teardown
++    ::Zip.reset!
++  end
++
+   def test_read_from_stream
+     ::File.open(TestZipFile::TEST_ZIP2.zip_name, "rb") {
+         |zipFile|
+--- ruby-zip-1.1.6.orig/test/entry_set_test.rb
++++ ruby-zip-1.1.6/test/entry_set_test.rb
+@@ -14,6 +14,10 @@ class ZipEntrySetTest < MiniTest::Unit::
+     @zipEntrySet = ::Zip::EntrySet.new(ZIP_ENTRIES)
+   end
+ 
++  def teardown
++    ::Zip.reset!
++  end
++
+   def test_include
+     assert(@zipEntrySet.include?(ZIP_ENTRIES.first))
+     assert(!@zipEntrySet.include?(::Zip::Entry.new("different.zip", "different", "aComment")))
+--- ruby-zip-1.1.6.orig/test/settings_test.rb
++++ ruby-zip-1.1.6/test/settings_test.rb
+@@ -12,6 +12,10 @@ class ZipSettingsTest < MiniTest::Unit::
+     File.delete(TEST_OUT_NAME) if File.exist? TEST_OUT_NAME
+   end
+ 
++  def teardown
++    ::Zip.reset!
++  end
++
+   def open_zip(&aProc)
+     assert(aProc != nil)
+     ::Zip::File.open(TestZipFile::TEST_ZIP4.zip_name, &aProc)
+--- ruby-zip-1.1.6.orig/test/zip64_full_test.rb
++++ ruby-zip-1.1.6/test/zip64_full_test.rb
+@@ -8,6 +8,11 @@ if ENV['FULL_ZIP64_TEST']
+ # this test does not, of course, run with the normal unit tests! ;)
+ 
+   class Zip64FullTest < MiniTest::Unit::TestCase
++
++    def teardown
++      ::Zip.reset!
++    end
++
+     def prepareTestFile(test_filename)
+       ::File.delete(test_filename) if ::File.exist?(test_filename)
+       return test_filename
diff --git a/debian/patches/series b/debian/patches/series
index 6b97100..f800c6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 ignore-simplecov.diff
+fix-random-tests-failures

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