diff options
| author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-26 20:00:03 +0000 |
|---|---|---|
| committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-26 20:00:03 +0000 |
| commit | 5f4b705f43b69348ba842bc04b018c9c16fe58e6 (patch) | |
| tree | 0528aa41142b0121d4a730a02cb67191f1298f5a | |
| parent | 157914e2c71fca0da2f8b83551be330167b6619f (diff) | |
| download | ruby-5f4b705f43b69348ba842bc04b018c9c16fe58e6.tar.gz ruby-5f4b705f43b69348ba842bc04b018c9c16fe58e6.tar.xz ruby-5f4b705f43b69348ba842bc04b018c9c16fe58e6.zip | |
* test/ruby/test_file.rb: new file. only asserts unlink-before-close behaviour
now.
* test/soap/marshal/test_digraph.rb: should close before unlink.
unlink-before-close pattern is not needed here.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | test/ruby/test_file.rb | 32 | ||||
| -rw-r--r-- | test/soap/marshal/test_digraph.rb | 2 |
3 files changed, 41 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Mon Sep 27 04:57:07 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org> + + * test/ruby/test_file.rb: new file. only asserts unlink-before-close + behaviour now. + + * test/soap/marshal/test_digraph.rb: should close before unlink. + unlink-before-close pattern is not needed here. + Mon Sep 27 03:32:37 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org> * test/soap/*, test/wsdl/*, test/xsd/*: move TestCase classes into diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb new file mode 100644 index 000000000..d0ba276d3 --- /dev/null +++ b/test/ruby/test_file.rb @@ -0,0 +1,32 @@ +require 'test/unit' + +$KCODE = 'none' + +class TestFile < Test::Unit::TestCase + + # I don't know Ruby's spec about "unlink-before-close" exactly. + # This test asserts current behaviour. + def test_unlink_before_close + filename = File.basename(__FILE__) + ".#{$$}" + w = File.open(filename, "w") + w << "foo" + w.close + r = File.open(filename, "r") + begin + if /(mswin|bccwin|mingw)/ =~ RUBY_PLATFORM + begin + File.unlink(filename) + assert(false) + rescue Errno::EACCES + assert(true) + end + else + File.unlink(filename) + assert(true) + end + ensure + r.close + File.unlink(filename) if File.exist?(filename) + end + end +end diff --git a/test/soap/marshal/test_digraph.rb b/test/soap/marshal/test_digraph.rb index 2e79589dc..c83238748 100644 --- a/test/soap/marshal/test_digraph.rb +++ b/test/soap/marshal/test_digraph.rb @@ -36,7 +36,7 @@ class TestDigraph < Test::Unit::TestCase f = File.open("digraph_marshalled_string.soap", "wb") SOAP::Marshal.dump(@n1, f) f.close - str = File.open("digraph_marshalled_string.soap").read + str = File.read("digraph_marshalled_string.soap") newnode = SOAP::Marshal.unmarshal(str) assert_equal(newnode.first.first.__id__, newnode.second.first.__id__) assert_equal(newnode.first.first.first.first.__id__, newnode.second.first.second.first.__id__) |