Skip to content

Commit 0cb25e0

Browse files
committed
Removed redundant block
1 parent a7ad109 commit 0cb25e0

File tree

1 file changed

+20
-27
lines changed

1 file changed

+20
-27
lines changed

test/test_rake_file_utils.rb

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -342,40 +342,33 @@ def test_sh_if_a_command_exits_with_error_status_sh_echoes_it_fully
342342
end
343343
end
344344

345-
# https://github.com/seattlerb/minitest/blob/21d9e804b63c619f602f3f4ece6c71b48974707a/lib/minitest/assertions.rb#L188
346-
def _synchronize
347-
yield
348-
end
349-
350-
# https://github.com/seattlerb/minitest/blob/21d9e804b63c619f602f3f4ece6c71b48974707a/lib/minitest/assertions.rb#L546
345+
# Originally copied from minitest/assertions.rb
351346
def capture_subprocess_io
352-
_synchronize do
353-
begin
354-
require "tempfile"
347+
begin
348+
require "tempfile"
355349

356-
captured_stdout = Tempfile.new("out")
357-
captured_stderr = Tempfile.new("err")
350+
captured_stdout = Tempfile.new("out")
351+
captured_stderr = Tempfile.new("err")
358352

359-
orig_stdout = $stdout.dup
360-
orig_stderr = $stderr.dup
361-
$stdout.reopen captured_stdout
362-
$stderr.reopen captured_stderr
353+
orig_stdout = $stdout.dup
354+
orig_stderr = $stderr.dup
355+
$stdout.reopen captured_stdout
356+
$stderr.reopen captured_stderr
363357

364-
yield
358+
yield
365359

366-
$stdout.rewind
367-
$stderr.rewind
360+
$stdout.rewind
361+
$stderr.rewind
368362

369-
return captured_stdout.read, captured_stderr.read
370-
ensure
371-
$stdout.reopen orig_stdout
372-
$stderr.reopen orig_stderr
363+
[captured_stdout.read, captured_stderr.read]
364+
ensure
365+
$stdout.reopen orig_stdout
366+
$stderr.reopen orig_stderr
373367

374-
orig_stdout.close
375-
orig_stderr.close
376-
captured_stdout.close!
377-
captured_stderr.close!
378-
end
368+
orig_stdout.close
369+
orig_stderr.close
370+
captured_stdout.close!
371+
captured_stderr.close!
379372
end
380373
end
381374

0 commit comments

Comments
 (0)