Skip to content

Commit 3afa49d

Browse files
bundlerbotznznobuhsbt
committed
Merge #3023
3023: Backport ruby core r=hsbt a=hsbt # Description: ruby/ruby has minor changes for test code and typo fix. ______________ # Tasks: - [ ] Describe the problem / feature - [ ] Write tests - [ ] Write code to solve the problem - [ ] Get code review from coworkers / friends I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md). Co-authored-by: Kazuhiro NISHIYAMA <[email protected]> Co-authored-by: Nobuyoshi Nakada <[email protected]> Co-authored-by: Hiroshi SHIBATA <[email protected]>
1 parent 646b570 commit 3afa49d

File tree

6 files changed

+64
-63
lines changed

6 files changed

+64
-63
lines changed

‎lib/rubygems/core_ext/kernel_require.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def require(path)
4646
$LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp|
4747
safe_lp = lp.dup.tap(&Gem::UNTAINT)
4848
begin
49-
if File.symlink? safe_lp # for backword compatibility
49+
if File.symlink? safe_lp # for backward compatibility
5050
next
5151
end
5252
rescue SecurityError

‎lib/rubygems/core_ext/kernel_warn.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class << self
1616

1717
end
1818

19-
define_method(:warn) do |*messages, **kw|
19+
module_function define_method(:warn) {|*messages, **kw|
2020
unless uplevel = kw[:uplevel]
2121
if Gem.java_platform?
2222
return original_warn.call(*messages)
@@ -50,6 +50,6 @@ class << self
5050

5151
kw[:uplevel] = uplevel
5252
original_warn.call(*messages, **kw)
53-
end
53+
}
5454
end
5555
end

‎test/rubygems/test_gem.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ def assert_self_install_permissions(format_executable: false)
226226
def test_require_missing
227227
save_loaded_features do
228228
assert_raises ::LoadError do
229-
require "q"
229+
require "test_require_missing"
230230
end
231231
end
232232
end
@@ -1388,7 +1388,7 @@ def test_self_needs_picks_up_unresolved_deps
13881388
a = util_spec "a", "1"
13891389
b = util_spec "b", "1", "c" => nil
13901390
c = util_spec "c", "2"
1391-
d = util_spec "d", "1", {'e' => '= 1'}, "lib/d.rb"
1391+
d = util_spec "d", "1", {'e' => '= 1'}, "lib/d#{$$}.rb"
13921392
e = util_spec "e", "1"
13931393

13941394
install_specs a, c, b, e, d
@@ -1397,7 +1397,7 @@ def test_self_needs_picks_up_unresolved_deps
13971397
r.gem "a"
13981398
r.gem "b", "= 1"
13991399

1400-
require 'd'
1400+
require "d#{$$}"
14011401
end
14021402

14031403
assert_equal %w!a-1 b-1 c-2 d-1 e-1!, loaded_spec_names

‎test/rubygems/test_gem_gem_runner.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ class TestGemGemRunner < Gem::TestCase
66
def setup
77
super
88

9+
require 'rubygems/command'
910
@orig_args = Gem::Command.build_args
1011

1112
require 'rubygems/gem_runner'

‎test/rubygems/test_gem_specification.rb‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ def test_self_activate
126126
def test_self_activate_ambiguous_direct
127127
save_loaded_features do
128128
a1 = util_spec "a", "1", "b" => "> 0"
129-
b1 = util_spec("b", "1", { "c" => ">= 1" }, "lib/d.rb")
130-
b2 = util_spec("b", "2", { "c" => ">= 2" }, "lib/d.rb")
129+
b1 = util_spec("b", "1", { "c" => ">= 1" }, "lib/d#{$$}.rb")
130+
b2 = util_spec("b", "2", { "c" => ">= 2" }, "lib/d#{$$}.rb")
131131
c1 = util_spec "c", "1"
132132
c2 = util_spec "c", "2"
133133

@@ -138,7 +138,7 @@ def test_self_activate_ambiguous_direct
138138
assert_equal %w(a-1), loaded_spec_names
139139
assert_equal ["b (> 0)"], unresolved_names
140140

141-
require "d"
141+
require "d#{$$}"
142142

143143
assert_equal %w(a-1 b-2 c-2), loaded_spec_names
144144
assert_equal [], unresolved_names
@@ -176,16 +176,16 @@ def test_self_activate_ambiguous_indirect
176176
a1 = util_spec "a", "1", "b" => "> 0"
177177
b1 = util_spec "b", "1", "c" => ">= 1"
178178
b2 = util_spec "b", "2", "c" => ">= 2"
179-
c1 = util_spec "c", "1", nil, "lib/d.rb"
180-
c2 = util_spec "c", "2", nil, "lib/d.rb"
179+
c1 = util_spec "c", "1", nil, "lib/d#{$$}.rb"
180+
c2 = util_spec "c", "2", nil, "lib/d#{$$}.rb"
181181

182182
install_specs c1, c2, b1, b2, a1
183183

184184
a1.activate
185185
assert_equal %w(a-1), loaded_spec_names
186186
assert_equal ["b (> 0)"], unresolved_names
187187

188-
require "d"
188+
require "d#{$$}"
189189

190190
assert_equal %w(a-1 b-2 c-2), loaded_spec_names
191191
assert_equal [], unresolved_names
@@ -198,16 +198,16 @@ def test_self_activate_ambiguous_indirect_conflict
198198
a2 = util_spec "a", "2", "b" => "> 0"
199199
b1 = util_spec "b", "1", "c" => ">= 1"
200200
b2 = util_spec "b", "2", "c" => ">= 2"
201-
c1 = util_spec "c", "1", nil, "lib/d.rb"
202-
c2 = util_spec("c", "2", { "a" => "1" }, "lib/d.rb") # conflicts with a-2
201+
c1 = util_spec "c", "1", nil, "lib/d#{$$}.rb"
202+
c2 = util_spec("c", "2", { "a" => "1" }, "lib/d#{$$}.rb") # conflicts with a-2
203203

204204
install_specs c1, b1, a1, a2, c2, b2
205205

206206
a2.activate
207207
assert_equal %w(a-2), loaded_spec_names
208208
assert_equal ["b (> 0)"], unresolved_names
209209

210-
require "d"
210+
require "d#{$$}"
211211

212212
assert_equal %w(a-2 b-1 c-1), loaded_spec_names
213213
assert_equal [], unresolved_names
@@ -221,15 +221,15 @@ def test_self_activate_ambiguous_unrelated
221221
b2 = util_spec "b", "2", "c" => ">= 2"
222222
c1 = util_spec "c", "1"
223223
c2 = util_spec "c", "2"
224-
d1 = util_spec "d", "1", nil, "lib/d.rb"
224+
d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb"
225225

226226
install_specs d1, c1, c2, b1, b2, a1
227227

228228
a1.activate
229229
assert_equal %w(a-1), loaded_spec_names
230230
assert_equal ["b (> 0)"], unresolved_names
231231

232-
require "d"
232+
require "d#{$$}"
233233

234234
assert_equal %w(a-1 d-1), loaded_spec_names
235235
assert_equal ["b (> 0)"], unresolved_names
@@ -241,14 +241,14 @@ def test_require_should_prefer_latest_gem_level1
241241
a1 = util_spec "a", "1", "b" => "> 0"
242242
b1 = util_spec "b", "1", "c" => ">= 0" # unresolved
243243
b2 = util_spec "b", "2", "c" => ">= 0"
244-
c1 = util_spec "c", "1", nil, "lib/c.rb" # 1st level
245-
c2 = util_spec "c", "2", nil, "lib/c.rb"
244+
c1 = util_spec "c", "1", nil, "lib/c#{$$}.rb" # 1st level
245+
c2 = util_spec "c", "2", nil, "lib/c#{$$}.rb"
246246

247247
install_specs c1, c2, b1, b2, a1
248248

249249
a1.activate
250250

251-
require "c"
251+
require "c#{$$}"
252252

253253
assert_equal %w(a-1 b-2 c-2), loaded_spec_names
254254
end
@@ -261,14 +261,14 @@ def test_require_should_prefer_latest_gem_level2
261261
b2 = util_spec "b", "2", "c" => ">= 0"
262262
c1 = util_spec "c", "1", "d" => ">= 0" # 1st level
263263
c2 = util_spec "c", "2", "d" => ">= 0"
264-
d1 = util_spec "d", "1", nil, "lib/d.rb" # 2nd level
265-
d2 = util_spec "d", "2", nil, "lib/d.rb"
264+
d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb" # 2nd level
265+
d2 = util_spec "d", "2", nil, "lib/d#{$$}.rb"
266266

267267
install_specs d1, d2, c1, c2, b1, b2, a1
268268

269269
a1.activate
270270

271-
require "d"
271+
require "d#{$$}"
272272

273273
assert_equal %w(a-1 b-2 c-2 d-2), loaded_spec_names
274274
end
@@ -281,15 +281,15 @@ def test_require_finds_in_2nd_level_indirect
281281
b2 = util_spec "b", "2", "c" => ">= 0"
282282
c1 = util_spec "c", "1", "d" => "<= 2" # 1st level
283283
c2 = util_spec "c", "2", "d" => "<= 2"
284-
d1 = util_spec "d", "1", nil, "lib/d.rb" # 2nd level
285-
d2 = util_spec "d", "2", nil, "lib/d.rb"
286-
d3 = util_spec "d", "3", nil, "lib/d.rb"
284+
d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb" # 2nd level
285+
d2 = util_spec "d", "2", nil, "lib/d#{$$}.rb"
286+
d3 = util_spec "d", "3", nil, "lib/d#{$$}.rb"
287287

288288
install_specs d1, d2, d3, c1, c2, b1, b2, a1
289289

290290
a1.activate
291291

292-
require "d"
292+
require "d#{$$}"
293293

294294
assert_equal %w(a-1 b-2 c-2 d-2), loaded_spec_names
295295
end
@@ -302,16 +302,16 @@ def test_require_should_prefer_reachable_gems
302302
b2 = util_spec "b", "2", "c" => ">= 0"
303303
c1 = util_spec "c", "1", "d" => "<= 2" # 1st level
304304
c2 = util_spec "c", "2", "d" => "<= 2"
305-
d1 = util_spec "d", "1", nil, "lib/d.rb" # 2nd level
306-
d2 = util_spec "d", "2", nil, "lib/d.rb"
307-
d3 = util_spec "d", "3", nil, "lib/d.rb"
308-
e = util_spec "anti_d", "1", nil, "lib/d.rb"
305+
d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb" # 2nd level
306+
d2 = util_spec "d", "2", nil, "lib/d#{$$}.rb"
307+
d3 = util_spec "d", "3", nil, "lib/d#{$$}.rb"
308+
e = util_spec "anti_d", "1", nil, "lib/d#{$$}.rb"
309309

310310
install_specs d1, d2, d3, e, c1, c2, b1, b2, a1
311311

312312
a1.activate
313313

314-
require "d"
314+
require "d#{$$}"
315315

316316
assert_equal %w(a-1 b-2 c-2 d-2), loaded_spec_names
317317
end
@@ -322,8 +322,8 @@ def test_require_should_not_conflict
322322
base = util_spec "0", "1", "A" => ">= 1"
323323
a1 = util_spec "A", "1", {"c" => ">= 2", "b" => "> 0"}, "lib/a.rb"
324324
a2 = util_spec "A", "2", {"c" => ">= 2", "b" => "> 0"}, "lib/a.rb"
325-
b1 = util_spec "b", "1", {"c" => "= 1"}, "lib/d.rb"
326-
b2 = util_spec "b", "2", {"c" => "= 2"}, "lib/d.rb"
325+
b1 = util_spec "b", "1", {"c" => "= 1"}, "lib/d#{$$}.rb"
326+
b2 = util_spec "b", "2", {"c" => "= 2"}, "lib/d#{$$}.rb"
327327
c1 = util_spec "c", "1", {}, "lib/c.rb"
328328
c2 = util_spec "c", "2", {}, "lib/c.rb"
329329
c3 = util_spec "c", "3", {}, "lib/c.rb"
@@ -334,7 +334,7 @@ def test_require_should_not_conflict
334334
assert_equal %w(0-1), loaded_spec_names
335335
assert_equal ["A (>= 1)"], unresolved_names
336336

337-
require "d"
337+
require "d#{$$}"
338338

339339
assert_equal %w(0-1 A-2 b-2 c-2), loaded_spec_names
340340
assert_equal [], unresolved_names
@@ -349,15 +349,15 @@ def test_inner_clonflict_in_indirect_gems
349349
c1 = util_spec "c", "1", "d" => "<= 2" # 1st level
350350
c2 = util_spec "c", "2", "d" => "<= 2"
351351
c3 = util_spec "c", "3", "d" => "<= 3"
352-
d1 = util_spec "d", "1", nil, "lib/d.rb" # 2nd level
353-
d2 = util_spec "d", "2", nil, "lib/d.rb"
354-
d3 = util_spec "d", "3", nil, "lib/d.rb"
352+
d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb" # 2nd level
353+
d2 = util_spec "d", "2", nil, "lib/d#{$$}.rb"
354+
d3 = util_spec "d", "3", nil, "lib/d#{$$}.rb"
355355

356356
install_specs d1, d2, d3, c1, c2, c3, b1, b2, a1
357357

358358
a1.activate
359359

360-
require "d"
360+
require "d#{$$}"
361361

362362
assert_includes [%w(a-1 b-2 c-3 d-2),%w(a-1 b-2 d-2)], loaded_spec_names
363363
end
@@ -371,15 +371,15 @@ def test_inner_clonflict_in_indirect_gems_reversed
371371
c1 = util_spec "xc", "1", "d" => "<= 3" # 1st level
372372
c2 = util_spec "xc", "2", "d" => "<= 2"
373373
c3 = util_spec "xc", "3", "d" => "<= 3"
374-
d1 = util_spec "d", "1", nil, "lib/d.rb" # 2nd level
375-
d2 = util_spec "d", "2", nil, "lib/d.rb"
376-
d3 = util_spec "d", "3", nil, "lib/d.rb"
374+
d1 = util_spec "d", "1", nil, "lib/d#{$$}.rb" # 2nd level
375+
d2 = util_spec "d", "2", nil, "lib/d#{$$}.rb"
376+
d3 = util_spec "d", "3", nil, "lib/d#{$$}.rb"
377377

378378
install_specs d1, d2, d3, c1, c2, c3, b1, b2, a1
379379

380380
a1.activate
381381

382-
require "d"
382+
require "d#{$$}"
383383

384384
assert_includes [%w(a-1 b-2 d-2 xc-3), %w(a-1 b-2 d-2)], loaded_spec_names
385385
end
@@ -516,12 +516,12 @@ def test_self_activate_via_require
516516
def test_self_activate_via_require_wtf
517517
save_loaded_features do
518518
a1 = util_spec "a", "1", "b" => "> 0", "d" => "> 0" # this
519-
b1 = util_spec "b", "1", { "c" => ">= 1" }, "lib/b.rb"
520-
b2 = util_spec "b", "2", { "c" => ">= 2" }, "lib/b.rb" # this
519+
b1 = util_spec "b", "1", { "c" => ">= 1" }, "lib/b#{$$}.rb"
520+
b2 = util_spec "b", "2", { "c" => ">= 2" }, "lib/b#{$$}.rb" # this
521521
c1 = util_spec "c", "1"
522522
c2 = util_spec "c", "2" # this
523-
d1 = util_spec "d", "1", { "c" => "< 2" }, "lib/d.rb"
524-
d2 = util_spec "d", "2", { "c" => "< 2" }, "lib/d.rb" # this
523+
d1 = util_spec "d", "1", { "c" => "< 2" }, "lib/d#{$$}.rb"
524+
d2 = util_spec "d", "2", { "c" => "< 2" }, "lib/d#{$$}.rb" # this
525525

526526
install_specs c1, c2, b1, b2, d1, d2, a1
527527

@@ -530,10 +530,10 @@ def test_self_activate_via_require_wtf
530530
assert_equal %w(a-1), loaded_spec_names
531531
assert_equal ["b (> 0)", "d (> 0)"], unresolved_names
532532

533-
require "b"
533+
require "b#{$$}"
534534

535535
e = assert_raises Gem::LoadError do
536-
require "d"
536+
require "d#{$$}"
537537
end
538538

539539
assert_equal "unable to find a version of 'd' to activate", e.message
@@ -2287,15 +2287,15 @@ def test_fullpath_return_rb_extension_file_when_exist_the_same_name_file
22872287

22882288
def test_require_already_activated
22892289
save_loaded_features do
2290-
a1 = util_spec "a", "1", nil, "lib/d.rb"
2290+
a1 = util_spec "a", "1", nil, "lib/d#{$$}.rb"
22912291

22922292
install_specs a1 # , a2, b1, b2, c1, c2
22932293

22942294
a1.activate
22952295
assert_equal %w(a-1), loaded_spec_names
22962296
assert_equal [], unresolved_names
22972297

2298-
assert require "d"
2298+
assert require "d#{$$}"
22992299

23002300
assert_equal %w(a-1), loaded_spec_names
23012301
assert_equal [], unresolved_names
@@ -2308,8 +2308,8 @@ def test_require_already_activated_indirect_conflict
23082308
a2 = util_spec "a", "2", "b" => "> 0"
23092309
b1 = util_spec "b", "1", "c" => ">= 1"
23102310
b2 = util_spec "b", "2", "c" => ">= 2"
2311-
c1 = util_spec "c", "1", nil, "lib/d.rb"
2312-
c2 = util_spec("c", "2", { "a" => "1" }, "lib/d.rb") # conflicts with a-2
2311+
c1 = util_spec "c", "1", nil, "lib/d#{$$}.rb"
2312+
c2 = util_spec("c", "2", { "a" => "1" }, "lib/d#{$$}.rb") # conflicts with a-2
23132313

23142314
install_specs c1, b1, a1, a2, c2, b2
23152315

@@ -2318,7 +2318,7 @@ def test_require_already_activated_indirect_conflict
23182318
assert_equal %w(a-1 c-1), loaded_spec_names
23192319
assert_equal ["b (> 0)"], unresolved_names
23202320

2321-
assert require "d"
2321+
assert require "d#{$$}"
23222322

23232323
assert_equal %w(a-1 c-1), loaded_spec_names
23242324
assert_equal ["b (> 0)"], unresolved_names

‎test/rubygems/test_require.rb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ def test_concurrent_require
124124
Object.const_set :FILE_ENTERED_LATCH, Latch.new(2)
125125
Object.const_set :FILE_EXIT_LATCH, Latch.new(1)
126126

127-
a1 = util_spec "a", "1", nil, "lib/a.rb"
128-
b1 = util_spec "b", "1", nil, "lib/b.rb"
127+
a1 = util_spec "a#{$$}", "1", nil, "lib/a#{$$}.rb"
128+
b1 = util_spec "b#{$$}", "1", nil, "lib/b#{$$}.rb"
129129

130130
install_specs a1, b1
131131

132-
t1 = create_sync_thread{ assert_require 'a' }
133-
t2 = create_sync_thread{ assert_require 'b' }
132+
t1 = create_sync_thread{ assert_require "a#{$$}" }
133+
t2 = create_sync_thread{ assert_require "b#{$$}" }
134134

135135
# wait until both files are waiting on the exit latch
136136
FILE_ENTERED_LATCH.await
@@ -326,7 +326,7 @@ def test_require_works_after_cleanup
326326
end
327327

328328
def test_require_doesnt_traverse_development_dependencies
329-
a = util_spec("a", "1", nil, "lib/a.rb")
329+
a = util_spec("a#{$$}", "1", nil, "lib/a#{$$}.rb")
330330
z = util_spec("z", "1", "w" => "> 0")
331331
w1 = util_spec("w", "1") { |s| s.add_development_dependency "non-existent" }
332332
w2 = util_spec("w", "2") { |s| s.add_development_dependency "non-existent" }
@@ -337,7 +337,7 @@ def test_require_doesnt_traverse_development_dependencies
337337
assert_equal %w(z-1), loaded_spec_names
338338
assert_equal ["w (> 0)"], unresolved_names
339339

340-
assert require("a")
340+
assert require("a#{$$}")
341341
end
342342

343343
def test_default_gem_only
@@ -448,15 +448,15 @@ def self.gem(*args)
448448
end
449449

450450
def test_require_default_when_gem_defined
451-
a = util_spec("a", "1", nil, "lib/a.rb")
451+
a = util_spec("a#{$$}", "1", nil, "lib/a#{$$}.rb")
452452
install_specs a
453453
c = Class.new do
454454
def self.gem(*args)
455455
raise "received #gem with #{args.inspect}"
456456
end
457457
end
458-
assert c.send(:require, "a")
459-
assert_equal %w(a-1), loaded_spec_names
458+
assert c.send(:require, "a#{$$}")
459+
assert_equal %W(a#{$$}-1), loaded_spec_names
460460
end
461461

462462
def test_require_bundler

0 commit comments

Comments
 (0)