merges r30284 from trunk into ruby_1_9_2.

--
* 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]

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

4 files changed, 19 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 28c07c6a37..7a4fd449ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 01:41:42 2010  Masaya Tarui  <tarui@ruby-lnag.org>
 
 	* io.c : add an extra byte to buffer for the specification of read
diff --git a/test/rexml/test_contrib.rb b/test/rexml/test_contrib.rb
index 785169bdd0..bf559ddc9f 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
diff --git a/version.h b/version.h
index c7e3f3b957..a75fbe8a1c 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 127
+#define RUBY_PATCHLEVEL 128
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1