diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | test/rexml/test_contrib.rb | 16 | ||||
| -rw-r--r-- | test/rexml/test_sax.rb | 6 |
3 files changed, 18 insertions, 12 deletions
@@ -1,3 +1,11 @@ +Tue Dec 21 06:25:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * test/rexml/test_contrib.rb (ContribTester#test_pos): should not + use fixed path name for tests. [ruby-dev:42827] + + * test/rexml/test_sax.rb (SAX2Tester#test_socket): should not use + fixed port for tests. [ruby-dev:42828] + Tue Dec 21 06:10:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * compile.c (setup_args), vm.c (invoke_block_from_c), diff --git a/test/rexml/test_contrib.rb b/test/rexml/test_contrib.rb index f448b0fe4a..3bbaa083b3 100644 --- a/test/rexml/test_contrib.rb +++ b/test/rexml/test_contrib.rb @@ -74,7 +74,7 @@ DELIMITER EOF doc = REXML::Document.new source doc.write(out="") - assert(out[/>'>/] != nil, "Couldn't find >'>") + assert(out[/>\'>/] != nil, "Couldn't find >'>") assert(out[/\]>/] != nil, "Couldn't find ]>") end @@ -512,7 +512,8 @@ EOL end def test_pos - testfile = "/tmp/tidal#{$$}" + require 'tempfile' + testfile = Tempfile.new("tidal") testdata = %Q{<calibration> <section name="parameters"> <param name="barpress">760</param> @@ -521,13 +522,12 @@ EOL </calibration> } - File.open(testfile, 'w') do |f| - f.puts testdata + testfile.puts testdata + testfile.rewind + assert_nothing_raised do + d = REXML::Document.new(testfile) end - File.open(testfile) do |f| - d = REXML::Document.new(f) - end - #File.unlink(testfile) + testfile.close(true) end def test_deep_clone diff --git a/test/rexml/test_sax.rb b/test/rexml/test_sax.rb index c5ac21ca3d..569270ceb1 100644 --- a/test/rexml/test_sax.rb +++ b/test/rexml/test_sax.rb @@ -221,10 +221,8 @@ class SAX2Tester < Test::Unit::TestCase def test_socket require 'socket' - port = 12345 - - server = TCPServer.new('127.0.0.1', port) - socket = TCPSocket.new('127.0.0.1', port) + server = TCPServer.new('127.0.0.1', 0) + socket = TCPSocket.new('127.0.0.1', server.addr[1]) ok = false session = server.accept |