Skip to content

Commit a36033d

Browse files
znzaycabta
authored andcommitted
Fix failures of test/rdoc/test_rdoc_ri_paths.rb
yield `home_dir` when HOMEDIR is not falsy only. https://github.com/ruby/ruby/blob/d0f41aa2382612022162d033ddb3d9c9cc62099e/lib/rdoc/ri/paths.rb#L43 ``` yield home_dir, :home if home and HOMEDIR ``` https://rubyci.org/logs/rubyci.s3.amazonaws.com/archlinux/ruby-master/log/20200426T033503Z.fail.html.gz ``` 1) Failure: TestRDocRIPaths#test_class_each [/home/chkbuild/build/20200426T033503Z/ruby/test/rdoc/test_rdoc_ri_paths.rb:54]: <nil> expected but was <"/home/naruse/chkbuild/tmp/build/20200426T033503Z/tmp/test_rdoc_ri_paths_1033468/doc/nodoc-1.0/ri">. 2) Failure: TestRDocRIPaths#test_class_raw_path [/home/chkbuild/build/20200426T033503Z/ruby/test/rdoc/test_rdoc_ri_paths.rb:131]: <nil> expected but was <"/home/naruse/chkbuild/tmp/build/20200426T033503Z/tmp/test_rdoc_ri_paths_1033468/doc/rake-10.0.1/ri">. 3) Failure: TestRDocRIPaths#test_class_raw_path_extra_dirs [/home/chkbuild/build/20200426T033503Z/ruby/test/rdoc/test_rdoc_ri_paths.rb:141]: <nil> expected but was <"/home/naruse/chkbuild/tmp/build/20200426T033503Z/tmp/test_rdoc_ri_paths_1033468/doc/rake-10.0.1/ri">. ```
1 parent 966b9ed commit a36033d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/rdoc/test_rdoc_ri_paths.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_class_each
5151

5252
assert_equal RDoc::RI::Paths.system_dir, path.shift
5353
assert_equal RDoc::RI::Paths.site_dir, path.shift
54-
assert_equal RDoc::RI::Paths.home_dir, path.shift
54+
assert_equal RDoc::RI::Paths.home_dir, path.shift if RDoc::RI::Paths.home_dir
5555
assert_equal File.join(@nodoc.doc_dir, 'ri'), path.shift
5656
assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
5757
assert_equal File.join(@rdoc_4_0.doc_dir, 'ri'), path.shift
@@ -128,7 +128,7 @@ def test_class_raw_path
128128

129129
assert_equal RDoc::RI::Paths.system_dir, path.shift
130130
assert_equal RDoc::RI::Paths.site_dir, path.shift
131-
assert_equal RDoc::RI::Paths.home_dir, path.shift
131+
assert_equal RDoc::RI::Paths.home_dir, path.shift if RDoc::RI::Paths.home_dir
132132
assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
133133
end
134134

@@ -138,7 +138,7 @@ def test_class_raw_path_extra_dirs
138138
assert_equal '/nonexistent', path.shift
139139
assert_equal RDoc::RI::Paths.system_dir, path.shift
140140
assert_equal RDoc::RI::Paths.site_dir, path.shift
141-
assert_equal RDoc::RI::Paths.home_dir, path.shift
141+
assert_equal RDoc::RI::Paths.home_dir, path.shift if RDoc::RI::Paths.home_dir
142142
assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
143143
end
144144

0 commit comments

Comments
 (0)