summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_path.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8808caf245..353e64b2db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 3 06:25:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/test_path.rb (test_path): get rid of blocking on
+ access to non-existent host.
+
Thu Jun 3 05:37:46 2010 Ryan Davis <ryand-ruby@zenspider.com>
* tool/rbinstall.rb (install-bin): Allow bin/* install from dot-dirs.
diff --git a/test/ruby/test_path.rb b/test/ruby/test_path.rb
index 606575e4ba..ad080fa444 100644
--- a/test/ruby/test_path.rb
+++ b/test/ruby/test_path.rb
@@ -35,8 +35,8 @@ class TestPath < Test::Unit::TestCase
assert_equal("/sub", File.expand_path("sub", "/"))
end
if dosish
- assert_equal("//machine/share", File.expand_path("/", "//machine/share/sub"))
- assert_equal("//machine/share/dir", File.expand_path("/dir", "//machine/share/sub"))
+ assert_equal("//127.0.0.1/share", File.expand_path("/", "//127.0.0.1/share/sub"))
+ assert_equal("//127.0.0.1/share/dir", File.expand_path("/dir", "//127.0.0.1/share/sub"))
assert_equal("z:/", File.expand_path("/", "z:/sub"))
assert_equal("z:/dir", File.expand_path("/dir", "z:/sub"))
end