[DRE-commits] [SCM] gem2deb.git branch, master, updated. 0.2.7-9-g5b16cf2

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 7cd45797a3cec929049062e6532a47a5efb966a2
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Fri Sep 9 09:04:02 2011 -0700

    Make tests pass under Ruby 1.9 as well
    
    Surprisingly, all the changes needed were small bugs in the tests
    themselves, plus fiddling with test/unit internals in
    test/test_helper.rb
    
    The code is completely 1.9-ready. :-)

diff --git a/test/sample/test_runner/rake/fail/debian/ruby-tests.rake b/test/sample/test_runner/rake/fail/debian/ruby-tests.rake
index 69fdfcf..19e0175 100644
--- a/test/sample/test_runner/rake/fail/debian/ruby-tests.rake
+++ b/test/sample/test_runner/rake/fail/debian/ruby-tests.rake
@@ -1,5 +1,5 @@
 require 'gem2deb/rake/testtask'
 
 Gem2Deb::Rake::TestTask.new do |t|
-  t.test_files = 'test/test.rb'
+  t.test_files = ['test/test.rb']
 end
diff --git a/test/sample/test_runner/rake/pass/debian/ruby-tests.rake b/test/sample/test_runner/rake/pass/debian/ruby-tests.rake
index 69fdfcf..19e0175 100644
--- a/test/sample/test_runner/rake/pass/debian/ruby-tests.rake
+++ b/test/sample/test_runner/rake/pass/debian/ruby-tests.rake
@@ -1,5 +1,5 @@
 require 'gem2deb/rake/testtask'
 
 Gem2Deb::Rake::TestTask.new do |t|
-  t.test_files = 'test/test.rb'
+  t.test_files = ['test/test.rb']
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index d449e8d..eebbb6c 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -5,7 +5,8 @@ require 'fileutils'
 require 'tmpdir'
 require 'tempfile'
 
-class Gem2DebTestCase < Test::Unit::TestCase
+Gem2DebTestCase = Test::Unit::TestCase
+class Gem2DebTestCase
 
   VENDOR_ARCH_DIRS = {
     'ruby1.8'   => `ruby1.8   -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']"`.strip,
@@ -23,6 +24,7 @@ class Gem2DebTestCase < Test::Unit::TestCase
     def tmpdir
       @tmpdir ||= File.join(Gem2DebTestCase::TMP_DIR, name)
       FileUtils.mkdir_p(@tmpdir)
+      @tmpdir
     end
     def one_time_setup_blocks
       @one_time_setup_blocks ||= []
@@ -38,6 +40,22 @@ class Gem2DebTestCase < Test::Unit::TestCase
         one_time_setup_blocks.each(&:call)
         @one_time_setup = true
       end
+      setup_cleanup
+    end
+    def setup_cleanup
+      unless $__gem2deb_tests_cleanup_installed
+        at_exit do
+          if ENV['GEM2DEB_DEBUG']
+            puts
+            puts "======================================================================="
+            puts "Temporary test files left in #{Gem2DebTestCase::TMP_DIR} for inspection!"
+            puts
+          else
+            FileUtils.rm_rf(Gem2DebTestCase::TMP_DIR)
+          end
+        end
+      end
+      $__gem2deb_tests_cleanup_installed = true
     end
   end
   def tmpdir
@@ -48,11 +66,6 @@ class Gem2DebTestCase < Test::Unit::TestCase
     self.class.one_time_setup!
   end
 
-  def run(runner)
-    return if @method_name.to_s == 'default_test'
-    super
-  end
-
   protected
 
   def unpack(tarball)
@@ -155,22 +168,3 @@ class Gem2DebTestCase < Test::Unit::TestCase
   end
 
 end
-
-class Test::Unit::AutoRunner
-  alias :orig_run :run
-  def run
-    ret = nil
-    if ENV['GEM2DEB_TEST_DEBUG']
-      puts "Running tests in debug mode ..."
-      ret = orig_run
-      puts
-      puts "======================================================================="
-      puts "Temporary test files left in #{Gem2DebTestCase::TMP_DIR} for inspection!"
-      puts
-    else
-      ret = orig_run
-      FileUtils.rm_rf(Gem2DebTestCase::TMP_DIR)
-    end
-    ret
-  end
-end
diff --git a/test/unit/dh_ruby_test.rb b/test/unit/dh_ruby_test.rb
index 84d2e54..11e7598 100644
--- a/test/unit/dh_ruby_test.rb
+++ b/test/unit/dh_ruby_test.rb
@@ -234,7 +234,7 @@ class DhRubyTest < Gem2DebTestCase
         dh_ruby.clean
         dh_ruby.configure
         dh_ruby.build
-        dh_ruby.install File.join(directory, 'debian', 'tmp')
+        dh_ruby.install([File.join(directory, 'debian', 'tmp')])
       end
     end
   end
diff --git a/test/unit/dh_rubysetuprb_test.rb b/test/unit/dh_rubysetuprb_test.rb
index 451fd83..a501472 100644
--- a/test/unit/dh_rubysetuprb_test.rb
+++ b/test/unit/dh_rubysetuprb_test.rb
@@ -63,7 +63,7 @@ class DhRubySetuprbTest < Gem2DebTestCase
           dh_ruby.clean
           dh_ruby.configure
           dh_ruby.build
-          dh_ruby.install File.join(package_path, 'debian', 'tmp')
+          dh_ruby.install([File.join(package_path, 'debian', 'tmp')])
         end
       end
     end

-- 
gem2deb.git