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
