1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

refine previous change.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-09-28 18:22:23 +00:00
parent a9c2a18cc7
commit 4dc8ff965b
4 changed files with 105 additions and 99 deletions

View file

@ -15,7 +15,8 @@ class TestSystem < Test::Unit::TestCase
assert_equal("foobar\n", `echo foobar`) assert_equal("foobar\n", `echo foobar`)
assert_equal('foobar', `#{ruby} -e 'print "foobar"'`) assert_equal('foobar', `#{ruby} -e 'print "foobar"'`)
tmpfilename = "#{Dir.tmpdir}/ruby_script_tmp.#{$$}" Dir.mktmpdir("ruby_script_tmp") {|tmpdir|
tmpfilename = "#{tmpdir}/ruby_script_tmp.#{$$}"
tmp = open(tmpfilename, "w") tmp = open(tmpfilename, "w")
tmp.print "print $zzz\n"; tmp.print "print $zzz\n";
@ -57,6 +58,7 @@ class TestSystem < Test::Unit::TestCase
File.unlink tmpfilename or `/bin/rm -f "#{tmpfilename}"` File.unlink tmpfilename or `/bin/rm -f "#{tmpfilename}"`
File.unlink "#{tmpfilename}.bak" or `/bin/rm -f "#{tmpfilename}.bak"` File.unlink "#{tmpfilename}.bak" or `/bin/rm -f "#{tmpfilename}.bak"`
}
end end
def test_syntax def test_syntax

View file

@ -3,7 +3,8 @@ require 'tmpdir'
class TestWhileuntil < Test::Unit::TestCase class TestWhileuntil < Test::Unit::TestCase
def test_while def test_while
tmpfilename = "#{Dir.tmpdir}/ruby_while_tmp.#{$$}" Dir.mktmpdir("ruby_while_tmp") {|tmpdir|
tmpfilename = "#{tmpdir}/ruby_while_tmp.#{$$}"
tmp = open(tmpfilename, "w") tmp = open(tmpfilename, "w")
tmp.print "tvi925\n"; tmp.print "tvi925\n";
@ -68,6 +69,7 @@ class TestWhileuntil < Test::Unit::TestCase
File.unlink tmpfilename or `/bin/rm -f "#{tmpfilename}"` File.unlink tmpfilename or `/bin/rm -f "#{tmpfilename}"`
assert(!File.exist?(tmpfilename)) assert(!File.exist?(tmpfilename))
}
end end
def test_until def test_until

View file

@ -297,7 +297,7 @@ class TestIOScanf
include Scanf include Scanf
extend ScanfTests extend ScanfTests
tmpfilename = "#{Dir.tmpdir}/iotest.dat" tmpfilename = "#{Dir.tmpdir}/iotest.dat.#{$$}"
i = 1 i = 1
self.tests.each do |test| self.tests.each do |test|

View file

@ -50,8 +50,9 @@ alias set_up setup
end end
def test_io1 def test_io1
File.open("#{Dir.tmpdir}/iotest.dat", "w") { |fh| fh.puts(@str) } fn = "#{Dir.tmpdir}/iotest.dat.#{$$}"
fh = File.open("#{Dir.tmpdir}/iotest.dat", "rb") File.open(fn, "w") { |fh| fh.puts(@str) }
fh = File.open(fn, "rb")
res = fh.scanf("%s%d") { |name, year| "#{name} was born in #{year}." } res = fh.scanf("%s%d") { |name, year| "#{name} was born in #{year}." }
assert_equal( assert_equal(
@ -62,18 +63,19 @@ alias set_up setup
"Brahms was born in 1833." ],res) "Brahms was born in 1833." ],res)
fh.close fh.close
ensure ensure
File.delete("#{Dir.tmpdir}/iotest.dat") File.delete(fn)
end end
def test_io2 def test_io2
File.open("#{Dir.tmpdir}/iotest.dat", "w").close fn = "#{Dir.tmpdir}/iotest.dat.#{$$}"
fh = File.open("#{Dir.tmpdir}/iotest.dat","rb") File.open(fn, "w").close
fh = File.open(fn,"rb")
assert_equal(fh.scanf("") {}, []) assert_equal(fh.scanf("") {}, [])
fh.seek(0) fh.seek(0)
assert_equal(fh.scanf("%d%f%s") {}, []) assert_equal(fh.scanf("%d%f%s") {}, [])
fh.close fh.close
ensure ensure
File.delete("#{Dir.tmpdir}/iotest.dat") File.delete(fn)
end end
end end