merge revision(s) 34268:

	* test/readline/test_readline.rb (test_completion_proc_empty_result):
	  ensure clearance of Readline's line_buffer after the test.


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

3 files changed, 17 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ef774d47d..e87ec9acdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 17 12:26:15 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* test/readline/test_readline.rb (test_completion_proc_empty_result):
+	  ensure clearance of Readline's line_buffer after the test.
+
 Fri Feb 17 11:46:39 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/readline/test_readline.rb (test_line_buffer__point): use
diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
index c5188ad5c6..fe8aa0e843 100644
--- a/test/readline/test_readline.rb
+++ b/test/readline/test_readline.rb
@@ -208,11 +208,19 @@ class TestReadline < Test::Unit::TestCase
       stdin.write("first\t")
       stdin.flush
       Readline.completion_proc = ->(text) {[]}
-      line = nil
+      line1 = line2 = nil
       replace_stdio(stdin.path, stdout.path) {
-        assert_nothing_raised(NoMemoryError) {line = Readline.readline("> ")}
+        assert_nothing_raised(NoMemoryError) {line1 = Readline.readline("> ")}
+        stdin.write("\n")
+        stdin.flush
+        assert_nothing_raised(NoMemoryError) {line2 = Readline.readline("> ")}
       }
-      assert_equal("first", line)
+      assert_equal("first", line1)
+      assert_equal("", line2)
+      begin
+        assert_equal("", Readline.line_buffer)
+      rescue NotimplementedError
+      end
     end
   end
 
diff --git a/version.h b/version.h
index 8db74093b0..83c047164d 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 131
+#define RUBY_PATCHLEVEL 132
 
 #define RUBY_RELEASE_DATE "2012-02-17"
 #define RUBY_RELEASE_YEAR 2012