From 9792c9d183ccc0e80230858c910c74cfef5ddc32 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Fri, 23 Aug 2019 14:50:34 -0700 Subject: [PATCH] [ruby/fileutils] Fix test_cp_r_dev on Windows or other systems without character/block device in /dev Previously this would give an error such as: TestFileUtils#test_cp_r_dev [c:/fileutils/test/fileutils/test_fileutils.rb:455]: [RuntimeError] exception expected, not. Class: Message: <"no implicit conversion of nil into String"> https://github.com/ruby/fileutils/commit/0ce0fefbeb --- test/fileutils/test_fileutils.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index 41100e12a9..23f05d2b44 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -450,11 +450,11 @@ class TestFileUtils < Test::Unit::TestCase def test_cp_r_dev devs = Dir['/dev/*'] - chardev = Dir['/dev/*'].find{|f| File.chardev?(f)} - blockdev = Dir['/dev/*'].find{|f| File.blockdev?(f)} + chardev = devs.find{|f| File.chardev?(f)} + blockdev = devs.find{|f| File.blockdev?(f)} Dir.mkdir('tmp/cpr_dest') - assert_raise(RuntimeError) { cp_r chardev, 'tmp/cpr_dest/cd' } - assert_raise(RuntimeError) { cp_r blockdev, 'tmp/cpr_dest/bd' } + assert_raise(RuntimeError) { cp_r chardev, 'tmp/cpr_dest/cd' } if chardev + assert_raise(RuntimeError) { cp_r blockdev, 'tmp/cpr_dest/bd' } if blockdev end begin