diff options
author | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-22 03:36:38 +0000 |
---|---|---|
committer | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-22 03:36:38 +0000 |
commit | a790bd0bd775927583ff5502b4ccd54e6cfb0706 (patch) | |
tree | 6bf05fd433defc490279b1a724609053a5924800 /test | |
parent | a6fcf3e5e266836b983e50242dc18ef438320e90 (diff) | |
download | ruby-a790bd0bd775927583ff5502b4ccd54e6cfb0706.tar.gz |
* lib/test/unit.rb: Add new options; --jobs,-j,--ruby,--jobs-status,
--no-retry.
[Feature #4415] [ruby-dev:43226],[ruby-dev:43222],[ruby-core:35294]
* lib/test/unit/parallel.rb: Used at test/unit --jobs(-j) option.
* test/csv/test_serialization.rb: test/unit parallel running ready.
* test/rake/test_file_task.rb: test/unit parallel running ready.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rwxr-xr-x | test/csv/test_serialization.rb | 2 | ||||
-rw-r--r-- | test/rake/test_file_task.rb | 56 |
2 files changed, 31 insertions, 27 deletions
diff --git a/test/csv/test_serialization.rb b/test/csv/test_serialization.rb index 0adb972c2f..ba19b7a391 100755 --- a/test/csv/test_serialization.rb +++ b/test/csv/test_serialization.rb @@ -131,7 +131,7 @@ class TestCSV::Serialization < TestCSV def test_io test_class_dump - data_file = File.join(File.dirname(__FILE__), "temp_test_data.csv") + data_file = File.join(File.dirname(__FILE__), "serialization_test_data.csv") CSV.dump(@names, File.open(data_file, "wb")) assert(File.exist?(data_file)) diff --git a/test/rake/test_file_task.rb b/test/rake/test_file_task.rb index 1b0c0a5614..0232ac95ed 100644 --- a/test/rake/test_file_task.rb +++ b/test/rake/test_file_task.rb @@ -29,7 +29,9 @@ class Rake::TestFileTask < Test::Unit::TestCase end def test_file_times_new_depends_on_old - create_timed_files(OLDFILE, NEWFILE) + until File.exist?(OLDFILE) && File.exist?(NEWFILE) + create_timed_files(OLDFILE, NEWFILE) + end t1 = Rake.application.intern(FileTask, NEWFILE).enhance([OLDFILE]) t2 = Rake.application.intern(FileTask, OLDFILE) @@ -38,7 +40,9 @@ class Rake::TestFileTask < Test::Unit::TestCase end def test_file_times_old_depends_on_new - create_timed_files(OLDFILE, NEWFILE) + until File.exist?(OLDFILE) && File.exist?(NEWFILE) + create_timed_files(OLDFILE, NEWFILE) + end t1 = Rake.application.intern(FileTask,OLDFILE).enhance([NEWFILE]) t2 = Rake.application.intern(FileTask, NEWFILE) @@ -93,46 +97,46 @@ class Rake::TestDirectoryTask < Test::Unit::TestCase include Rake def setup - rm_rf "testdata", :verbose=>false + rm_rf "testdata2", :verbose=>false end def teardown - rm_rf "testdata", :verbose=>false + rm_rf "testdata2", :verbose=>false end def test_directory desc "DESC" - directory "testdata/a/b/c" - assert_equal FileCreationTask, Task["testdata"].class - assert_equal FileCreationTask, Task["testdata/a"].class - assert_equal FileCreationTask, Task["testdata/a/b/c"].class - assert_nil Task["testdata"].comment - assert_equal "DESC", Task["testdata/a/b/c"].comment - assert_nil Task["testdata/a/b"].comment + directory "testdata2/a/b/c" + assert_equal FileCreationTask, Task["testdata2"].class + assert_equal FileCreationTask, Task["testdata2/a"].class + assert_equal FileCreationTask, Task["testdata2/a/b/c"].class + assert_nil Task["testdata2"].comment + assert_equal "DESC", Task["testdata2/a/b/c"].comment + assert_nil Task["testdata2/a/b"].comment verbose(false) { - Task['testdata/a/b'].invoke + Task['testdata2/a/b'].invoke } - assert File.exist?("testdata/a/b") - assert ! File.exist?("testdata/a/b/c") + assert File.exist?("testdata2/a/b") + assert ! File.exist?("testdata2/a/b/c") end if Rake::Win32.windows? def test_directory_win32 desc "WIN32 DESC" - FileUtils.mkdir_p("testdata") - Dir.chdir("testdata") do - directory 'c:/testdata/a/b/c' - assert_equal FileCreationTask, Task['c:/testdata'].class - assert_equal FileCreationTask, Task['c:/testdata/a'].class - assert_equal FileCreationTask, Task['c:/testdata/a/b/c'].class - assert_nil Task['c:/testdata'].comment - assert_equal "WIN32 DESC", Task['c:/testdata/a/b/c'].comment - assert_nil Task['c:/testdata/a/b'].comment + FileUtils.mkdir_p("testdata2") + Dir.chdir("testdata2") do + directory 'c:/testdata2/a/b/c' + assert_equal FileCreationTask, Task['c:/testdata2'].class + assert_equal FileCreationTask, Task['c:/testdata2/a'].class + assert_equal FileCreationTask, Task['c:/testdata2/a/b/c'].class + assert_nil Task['c:/testdata2'].comment + assert_equal "WIN32 DESC", Task['c:/testdata2/a/b/c'].comment + assert_nil Task['c:/testdata2/a/b'].comment verbose(false) { - Task['c:/testdata/a/b'].invoke + Task['c:/testdata2/a/b'].invoke } - assert File.exist?('c:/testdata/a/b') - assert ! File.exist?('c:/testdata/a/b/c') + assert File.exist?('c:/testdata2/a/b') + assert ! File.exist?('c:/testdata2/a/b/c') end end end |