naruse	2012-02-17 12:27:02 +0900 (Fri, 17 Feb 2012)

  New Revision: 34658

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34658

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

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/readline/test_readline.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34657)
+++ ruby_1_9_3/ChangeLog	(revision 34658)
@@ -1,3 +1,8 @@
+Fri Feb 17 12:26:15 2012  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* 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@r...>
 
 	* test/readline/test_readline.rb (test_line_buffer__point): use
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34657)
+++ ruby_1_9_3/version.h	(revision 34658)
@@ -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
Index: ruby_1_9_3/test/readline/test_readline.rb
===================================================================
--- ruby_1_9_3/test/readline/test_readline.rb	(revision 34657)
+++ ruby_1_9_3/test/readline/test_readline.rb	(revision 34658)
@@ -208,11 +208,19 @@
       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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/