refine previous change.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 10 insertions, 8 deletions

diff --git a/test/scanf/test_scanf.rb b/test/scanf/test_scanf.rb
index 2890a3a038..d2e7aa988f 100644
--- a/test/scanf/test_scanf.rb
+++ b/test/scanf/test_scanf.rb
@@ -297,7 +297,7 @@ class TestIOScanf
   include Scanf
   extend ScanfTests
 
-  tmpfilename = "#{Dir.tmpdir}/iotest.dat"
+  tmpfilename = "#{Dir.tmpdir}/iotest.dat.#{$$}"
   
   i = 1
   self.tests.each do |test|
diff --git a/test/scanf/test_scanfblocks.rb b/test/scanf/test_scanfblocks.rb
index 7048ae1bf7..907a3c2838 100644
--- a/test/scanf/test_scanfblocks.rb
+++ b/test/scanf/test_scanfblocks.rb
@@ -50,8 +50,9 @@ alias set_up setup
   end
 
   def test_io1
-    File.open("#{Dir.tmpdir}/iotest.dat", "w") { |fh| fh.puts(@str) }
-    fh = File.open("#{Dir.tmpdir}/iotest.dat", "rb")
+    fn = "#{Dir.tmpdir}/iotest.dat.#{$$}"
+    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}." }
 
     assert_equal(
@@ -62,18 +63,19 @@ alias set_up setup
       "Brahms was born in 1833." ],res)
     fh.close
   ensure
-    File.delete("#{Dir.tmpdir}/iotest.dat")  
-    end
+    File.delete(fn)  
+  end
 
   def test_io2
-    File.open("#{Dir.tmpdir}/iotest.dat", "w").close
-    fh = File.open("#{Dir.tmpdir}/iotest.dat","rb")
+    fn = "#{Dir.tmpdir}/iotest.dat.#{$$}"
+    File.open(fn, "w").close
+    fh = File.open(fn,"rb")
     assert_equal(fh.scanf("") {}, [])
     fh.seek(0)
     assert_equal(fh.scanf("%d%f%s") {}, [])
     fh.close
   ensure
-    File.delete("#{Dir.tmpdir}/iotest.dat")  
+    File.delete(fn)  
   end
 
 end