summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-22 23:38:04 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-22 23:38:04 +0000
commit0d9eecdb1a9427741b4f8c0f3a42c007510b6dd0 (patch)
tree26e29790ecde56b5af21741511dc6f08cade1c0d
parent3227143dc69af1493d12f0f75382dc735bd1cdc3 (diff)
downloadruby-0d9eecdb1a9427741b4f8c0f3a42c007510b6dd0.tar.gz
ruby-0d9eecdb1a9427741b4f8c0f3a42c007510b6dd0.tar.xz
ruby-0d9eecdb1a9427741b4f8c0f3a42c007510b6dd0.zip
* test/ruby/test_env.rb (TestEnv#test_aset): test updated.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--test/ruby/test_env.rb3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5eb77c987..38f538d52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ Tue Sep 23 08:25:56 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (env_aset): allow nil value to remove an entry.
[ruby-dev:36465]
+ * test/ruby/test_env.rb (TestEnv#test_aset): test updated.
+
Tue Sep 23 08:07:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* misc/ruby-mode.el (ruby-keyword-end-re): emacs21 support. a
diff --git a/test/ruby/test_env.rb b/test/ruby/test_env.rb
index 28f0e87b5..0ee702b22 100644
--- a/test/ruby/test_env.rb
+++ b/test/ruby/test_env.rb
@@ -118,7 +118,8 @@ class TestEnv < Test::Unit::TestCase
ENV["test"] = "foo"
end.join
end
- assert_raise(TypeError) { ENV["test"] = nil }
+ assert_nothing_raised { ENV["test"] = nil }
+ assert_equal(nil, ENV["test"])
assert_raise(ArgumentError) { ENV["foo\0bar"] = "test" }
assert_raise(ArgumentError) { ENV["test"] = "foo\0bar" }
ENV[PATH_ENV] = "/tmp/".taint