From 98ba116d402e7c255dae78ce43b76723a56c4cb7 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 29 May 2019 09:02:39 +0900 Subject: Revert 3b7862c8e88cd7838a53ec083ac5733386400956 causing various CI hangs and dependent commits c67934b1c3b40dda5f170b032423e520511c68dd and f0d1dc5cee87dfb023cb43a2db9bcdef5a8dee8f. RubyCI and ci.rvm.jp are almost dead by timeout since this commit. --- Revert "Skip a reline test hanging on Wercker since 3b7862c8e8" This reverts commit f0d1dc5cee87dfb023cb43a2db9bcdef5a8dee8f. Revert "Remove extra items because Reline::HISTORY is a sized queue" This reverts commit c67934b1c3b40dda5f170b032423e520511c68dd. Revert "Use existing instances for LineEditor and Config" This reverts commit 3b7862c8e88cd7838a53ec083ac5733386400956. --- test/reline/test_key_actor_vi.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'test/reline/test_key_actor_vi.rb') diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb index ac62a09d16..f5ceda05a6 100644 --- a/test/reline/test_key_actor_vi.rb +++ b/test/reline/test_key_actor_vi.rb @@ -4,13 +4,12 @@ class Reline::KeyActor::ViInsert::Test < Reline::TestCase def setup Reline.send(:test_mode) @prompt = '> ' - @config = Reline.class_variable_get(:@@config) # Emacs mode is default + @config = Reline::Config.new @config.read_lines(<<~LINES.split(/(?<=\n)/)) set editing-mode vi LINES - @line_editor = Reline.class_variable_get(:@@line_editor) - @encoding = (RELINE_TEST_ENCODING rescue Encoding.default_external) - @line_editor.reset(@prompt, @encoding) + @line_editor = Reline::LineEditor.new(@config) + @line_editor.reset(@prompt, (RELINE_TEST_ENCODING rescue Encoding.default_external)) end def test_vi_command_mode -- cgit v1.2.3