From 5e6fc71d96cd3d8e7442307c4d9343c6c5468364 Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 30 May 2008 13:18:17 +0000
Subject: [PATCH] * test/ruby/test_argf.rb: rename a conflicting method name.

* test/ruby/test_string.rb: ditto.

* test/ruby/test_io.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 8 ++++++++
 test/ruby/test_argf.rb   | 2 +-
 test/ruby/test_io.rb     | 2 +-
 test/ruby/test_string.rb | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc8c82b02d..77e46c87c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri May 30 22:17:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_argf.rb: rename a conflicting method name.
+
+	* test/ruby/test_string.rb: ditto.
+
+	* test/ruby/test_io.rb: ditto.
+
 Fri May 30 22:14:37 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* compile.c (defined_expr): fix SEGV by defined?([1]).
diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb
index c2a1633a6d..8280e5e506 100644
--- a/test/ruby/test_argf.rb
+++ b/test/ruby/test_argf.rb
@@ -93,7 +93,7 @@ class TestArgf < Test::Unit::TestCase
     end
   end
 
-  def test_lineno
+  def test_lineno2
     ruby('-e', <<-SRC, @t1.path, @t2.path, @t3.path) do |f|
       a = ARGF.dup
       a.gets; p $.  #=> 1
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index c04f216011..25ceb70be9 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -593,7 +593,7 @@ class TestIO < Test::Unit::TestCase
     assert_equal(nil, IO.try_convert("STDOUT"))
   end
 
-  def test_ungetc
+  def test_ungetc2
     pipe do |r, w|
       r.ungetc("0" * 10000)
       w.write("1" * 10000)
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index c71d3e5010..55cef9001e 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -1587,7 +1587,7 @@ class TestString < Test::Unit::TestCase
     assert("abc".end_with?("c"))
   end
 
-  def test_times
+  def test_times2
     s1 = ''
     100.times {|n|
       s2 = "a" * n