Skip to content

Commit da03ab6

Browse files
pterjanmatzbot
authored andcommitted
[ruby/reline] Fix tests failing when INPUTRC is defined
(ruby/reline#789) Failure: test_empty_xdg_config_home(Reline::Config::Test) /home/pterjan/reline/test/reline/test_config.rb:563:in `test_empty_xdg_config_home' 560: expected = File.expand_path('~/.config/readline/inputrc') 561: FileUtils.mkdir_p(File.dirname(expected)) 562: FileUtils.touch(expected) => 563: assert_equal expected, @config.inputrc_path 564: ensure 565: FileUtils.rm(expected) 566: ENV['XDG_CONFIG_HOME'] = xdg_config_home_backup <"/tmp/test_reline_config_4131165/.config/readline/inputrc"> expected but was <"/etc/inputrc"> ruby/reline@7de5a50f63
1 parent 2923f42 commit da03ab6

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

test/reline/test_config.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,24 +539,29 @@ def test_empty_inputrc
539539
def test_xdg_config_home
540540
home_backup = ENV['HOME']
541541
xdg_config_home_backup = ENV['XDG_CONFIG_HOME']
542+
inputrc_backup = ENV['INPUTRC']
542543
xdg_config_home = File.expand_path("#{@tmpdir}/.config/example_dir")
543544
expected = File.expand_path("#{xdg_config_home}/readline/inputrc")
544545
FileUtils.mkdir_p(File.dirname(expected))
545546
FileUtils.touch(expected)
546547
ENV['HOME'] = @tmpdir
547548
ENV['XDG_CONFIG_HOME'] = xdg_config_home
549+
ENV['INPUTRC'] = ''
548550
assert_equal expected, @config.inputrc_path
549551
ensure
550552
FileUtils.rm(expected)
551553
ENV['XDG_CONFIG_HOME'] = xdg_config_home_backup
552554
ENV['HOME'] = home_backup
555+
ENV['INPUTRC'] = inputrc_backup
553556
end
554557

555558
def test_empty_xdg_config_home
556559
home_backup = ENV['HOME']
557560
xdg_config_home_backup = ENV['XDG_CONFIG_HOME']
561+
inputrc_backup = ENV['INPUTRC']
558562
ENV['HOME'] = @tmpdir
559563
ENV['XDG_CONFIG_HOME'] = ''
564+
ENV['INPUTRC'] = ''
560565
expected = File.expand_path('~/.config/readline/inputrc')
561566
FileUtils.mkdir_p(File.dirname(expected))
562567
FileUtils.touch(expected)
@@ -565,12 +570,15 @@ def test_empty_xdg_config_home
565570
FileUtils.rm(expected)
566571
ENV['XDG_CONFIG_HOME'] = xdg_config_home_backup
567572
ENV['HOME'] = home_backup
573+
ENV['INPUTRC'] = inputrc_backup
568574
end
569575

570576
def test_relative_xdg_config_home
571577
home_backup = ENV['HOME']
572578
xdg_config_home_backup = ENV['XDG_CONFIG_HOME']
579+
inputrc_backup = ENV['INPUTRC']
573580
ENV['HOME'] = @tmpdir
581+
ENV['INPUTRC'] = ''
574582
expected = File.expand_path('~/.config/readline/inputrc')
575583
FileUtils.mkdir_p(File.dirname(expected))
576584
FileUtils.touch(expected)
@@ -586,6 +594,7 @@ def test_relative_xdg_config_home
586594
FileUtils.rm(expected)
587595
ENV['XDG_CONFIG_HOME'] = xdg_config_home_backup
588596
ENV['HOME'] = home_backup
597+
ENV['INPUTRC'] = inputrc_backup
589598
end
590599

591600
def test_reload

0 commit comments

Comments
 (0)