ruby-changes:15245
From: nobu <ko1@a...>
Date: Wed, 31 Mar 2010 16:05:53 +0900 (JST)
Subject: [ruby-changes:15245] Ruby:r27127 (trunk): * test/rake/test_{package_task,rules,task_manager}.rb: use
nobu 2010-03-31 16:05:24 +0900 (Wed, 31 Mar 2010) New Revision: 27127 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27127 Log: * test/rake/test_{package_task,rules,task_manager}.rb: use temporary directories. Modified files: trunk/ChangeLog trunk/test/rake/test_package_task.rb trunk/test/rake/test_rules.rb trunk/test/rake/test_task_manager.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 27126) +++ ChangeLog (revision 27127) @@ -1,3 +1,8 @@ +Wed Mar 31 16:05:13 2010 Nobuyoshi Nakada <nobu@r...> + + * test/rake/test_{package_task,rules,task_manager}.rb: use + temporary directories. + Wed Mar 31 13:53:13 2010 NARUSE, Yui <naruse@r...> * test/rubygems/gemutilities.rb (setup, teardown): Index: test/rake/test_rules.rb =================================================================== --- test/rake/test_rules.rb (revision 27126) +++ test/rake/test_rules.rb (revision 27127) @@ -1,4 +1,5 @@ require 'test/unit' +require 'tmpdir' require 'fileutils' require 'rake' require_relative 'filecreation' @@ -16,12 +17,18 @@ DOTFOOFILE = "testdata/.foo" def setup + @oldpwd = Dir.pwd + @tmpdir = Dir.mktmpdir("rake") + Dir.chdir(@tmpdir) + Dir.mkdir("testdata") Task.clear @runs = [] end def teardown - FileList['testdata/*'].uniq.each do |f| rm_r(f, :verbose=>false) end + FileList['testdata/{*,.[^.]*,}'].uniq.each do |f| rm_r(f, :verbose=>false) end + Dir.chdir(@oldpwd) + Dir.rmdir(@tmpdir) end def test_multiple_rules1 Index: test/rake/test_task_manager.rb =================================================================== --- test/rake/test_task_manager.rb (revision 27126) +++ test/rake/test_task_manager.rb (revision 27127) @@ -1,4 +1,6 @@ require 'test/unit' +require 'fileutils' +require 'tmpdir' require 'rake' class Rake::TestTaskManager < Test::Unit::TestCase @@ -7,9 +9,18 @@ end def setup + @oldpwd = Dir.pwd + @tmpdir = Dir.mktmpdir("rake") + Dir.chdir(@tmpdir) @tm = TaskManager.new + open("README", "wb") {} end + def teardown + Dir.chdir(@oldpwd) + FileUtils.rm_rf(@tmpdir) + end + def test_create_task_manager assert_not_nil @tm assert_equal [], @tm.tasks Index: test/rake/test_package_task.rb =================================================================== --- test/rake/test_package_task.rb (revision 27126) +++ test/rake/test_package_task.rb (revision 27127) @@ -1,3 +1,5 @@ +require 'tmpdir' +require 'fileutils' require 'test/unit' require 'rake/packagetask' @@ -5,6 +7,11 @@ include Rake def test_create + pwd = Dir.pwd + tmpdir = Dir.mktmpdir("rake") + Dir.chdir(tmpdir) + Dir.mkdir("bin") + open("bin/rake", "wb") {} pkg = Rake::PackageTask.new("pkgr", "1.2.3") { |p| p.package_files << "install.rb" p.package_files.include( @@ -35,6 +42,9 @@ assert Task["pkg/pkgr-1.2.3"] assert Task[:clobber_package] assert Task[:repackage] + ensure + Dir.chdir(pwd) + FileUtils.rm_rf(tmpdir) end def test_missing_version -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/