Properly restore Reline::IOGate in test teardown #593
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
When I run ~/ghq/github.com/ruby/ruby master* ⇣
❯ git diff
diff --git a/test/reline/helper.rb b/test/reline/helper.rb
index bb23893187..0a09185f92 100644
--- a/test/reline/helper.rb
+++ b/test/reline/helper.rb
@@ -21,21 +21,23 @@
module Reline
class <<self
def test_mode(ansi: false)
- remove_const('IOGate') if const_defined?('IOGate')
- const_set('IOGate', ansi ? Reline::ANSI : Reline::GeneralIO)
- if ENV['RELINE_TEST_ENCODING']
- encoding = Encoding.find(ENV['RELINE_TEST_ENCODING'])
- else
- encoding = Encoding::UTF_8
- end
- Reline::GeneralIO.reset(encoding: encoding) unless ansi
- core.config.instance_variable_set(:@test_mode, true)
- core.config.reset
+ @original_iogate = IOGate
+ remove_const('IOGate')
+ const_set('IOGate', ansi ? Reline::ANSI : Reline::GeneralIO)
+ if ENV['RELINE_TEST_ENCODING']
+ encoding = Encoding.find(ENV['RELINE_TEST_ENCODING'])
+ else
+ encoding = Encoding::UTF_8
+ end
+ Reline::GeneralIO.reset(encoding: encoding) unless ansi
+ core.config.instance_variable_set(:@test_mode, true)
+ core.config.reset
end
def test_reset
- remove_const('IOGate') if const_defined?('IOGate')
- const_set('IOGate', Reline::GeneralIO)
+ remove_const('IOGate')
+ const_set('IOGate', @original_iogate)
+ Reline::GeneralIO.reset
Reline.instance_variable_set(:@core, nil)
end
diff --git a/test/reline/test_history.rb b/test/reline/test_history.rb
index ddf8fb1472..390962a633 100644
--- a/test/reline/test_history.rb
+++ b/test/reline/test_history.rb
@@ -3,7 +3,7 @@
class Reline::History::Test < Reline::TestCase
def setup
- Reline.send(:test_mode)
+ Reline.test_mode
end
def teardown
diff --git a/test/reline/test_reline_key.rb b/test/reline/test_reline_key.rb
index fb700a6f2e..7f9a11394a 100644
--- a/test/reline/test_reline_key.rb
+++ b/test/reline/test_reline_key.rb
@@ -3,6 +3,7 @@
class Reline::TestKey < Reline::TestCase
def setup
+ Reline.test_mode
end
def teardown |
|
I think GeneralIO.reset has a bug. def self.reset(encoding: nil)
@@pasting = false
@@encoding = encoding # if @@encoding is changed to nil
end
def self.encoding
if defined?(@@encoding) # @@encoding is still defined
@@encoding # GeneralIO.encoding returns nil
...It should do remove_class_variable. updated |
matzbot
pushed a commit
to ruby/ruby
that referenced
this pull request
Sep 28, 2023
(ruby/reline#593) * Properly restore Reline::IOGate in test teardown * GeneralIO.reset should reset class variable existence ruby/reline@c16d33dae5
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
make test-all TESTS="reline/test_reline.rb irb/test_cmd.rb"was failing. Pager is shown and test will stop until you enterq.The reason of the failure is:
This pull request fixes test teardown to restore IOGate correctly.
show-source's test is also fixed in ruby/irb#720