[前][次][番号順一覧][スレッド一覧]

ruby-changes:30962

From: nobu <ko1@a...>
Date: Wed, 25 Sep 2013 16:46:24 +0900 (JST)
Subject: [ruby-changes:30962] nobu:r43041 (trunk): test_command_processor.rb: fix for mswin/mingw and test for directory

nobu	2013-09-25 16:46:20 +0900 (Wed, 25 Sep 2013)

  New Revision: 43041

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43041

  Log:
    test_command_processor.rb: fix for mswin/mingw and test for directory
    
    * test/shell/test_command_processor.rb (test_system_external): fix for
      mswin and mingw.  one of EXECUTABLE_EXTS is needed but shell.rb does
      not support it.
    
    * test/shell/test_command_processor.rb (test_system_directory): test
      not to find directory.  [ruby-core:57235] [Bug #8918]

  Modified files:
    trunk/test/shell/test_command_processor.rb
Index: test/shell/test_command_processor.rb
===================================================================
--- test/shell/test_command_processor.rb	(revision 43040)
+++ test/shell/test_command_processor.rb	(revision 43041)
@@ -18,12 +18,16 @@ class TestShell::CommandProcessor < Test https://github.com/ruby/ruby/blob/trunk/test/shell/test_command_processor.rb#L18
     tc
   end
 
+  def exeext
+    RbConfig::CONFIG["EXECUTABLE_EXTS"][/\S+\z/]
+  end
+
   def test_system_external
-    ext = RbConfig::CONFIG["EXECUTABLE_EXTS"][/\S+\z/]
-    path = File.join(@tmpdir, "foo#{ext}")
+    name = "foo#{exeext}"
+    path = File.join(@tmpdir, name)
     open(path, "w", 0755) {}
 
-    cmd = assert_throw(catch_command_start) {@shell.system("foo")}
+    cmd = assert_throw(catch_command_start) {@shell.system(name)}
     assert_equal(path, cmd.command)
   ensure
     File.unlink(path)
@@ -32,14 +36,30 @@ class TestShell::CommandProcessor < Test https://github.com/ruby/ruby/blob/trunk/test/shell/test_command_processor.rb#L36
   def test_system_not_found
     bug8918 = '[ruby-core:57235] [Bug #8918]'
 
-    path = File.join(@tmpdir, "foo")
+    name = "foo"
+    path = File.join(@tmpdir, name)
     open(path, "w", 0644) {}
 
     assert_raise(Shell::Error::CommandNotFound, bug8918) {
-      catch(catch_command_start) {@shell.system("foo")}
+      catch(catch_command_start) {@shell.system(name)}
     }
   ensure
     Process.waitall
     File.unlink(path)
   end
+
+  def test_system_directory
+    bug8918 = '[ruby-core:57235] [Bug #8918]'
+
+    name = "foo#{exeext}"
+    path = File.join(@tmpdir, name)
+    Dir.mkdir(path)
+
+    assert_raise(Shell::Error::CommandNotFound, bug8918) {
+      catch(catch_command_start) {@shell.system(name)}
+    }
+  ensure
+    Process.waitall
+    Dir.rmdir(path)
+  end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]