summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-05 16:15:16 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-05 16:15:16 +0000
commit22f1926644a213a39cd8a3f83a80518e5c15797f (patch)
tree664beb18420f4bc9329dc37e52bdeafbf000037a /test
parent313e0cb56aedfceb0bfaab2e430d2211c5e2043b (diff)
* range.c (rb_range_beg_len): should return Qfalse for non-range
object. * pack.c (EXTEND16): [ruby-dev:27383] * eval.c (set_trace_func): add rb_secure(4) to prevent adding tracing function. * lib/delegate.rb: document update from James Edward Gray II <james@grayproductions.net>. [ruby-core:05942] * process.c (proc_daemon): should restrict execution on levels higher than $SAFE=2. suggested by URABE Shyouhei <shyouhei@ice.uec.ac.jp>. * lib/forwardable.rb: replaced by new implementation from <Daniel.Berger@qwest.com>. [ruby-core:05899] * file.c (path_check_0): disallow sticky world writable directory in PATH (and $LOAD_PATH). [ruby-dev:27226] * numeric.c (fix_idiv): 1.div(1.0) should return integer value. [ruby-dev:27235] * lib/yaml.rb: require 'yaml/constants'. [ruby-core:5776] * lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): add charset information to content-type header.[ruby-core:5127] * lib/xmlrpc/server.rb (CGIServer::serve): ditto. * lib/xmlrpc/server.rb (ModRubyServer::serve): ditto. * lib/xmlrpc/server.rb (WEBrickServlet::service): ditto. * test/dbm/test_dbm.rb (TestDBM::test_s_open_error): remove test_s_open_error test to detect duplicate open. [ruby-dev:27202] * eval.c (splat_value): use to_a to splat non Array object. * object.c (nil_to_a): remove nil.to_a. [experimental] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/dbm/test_dbm.rb8
-rw-r--r--test/xmlrpc/webrick_testing.rb4
2 files changed, 2 insertions, 10 deletions
diff --git a/test/dbm/test_dbm.rb b/test/dbm/test_dbm.rb
index 0a604e5..cec2b20 100644
--- a/test/dbm/test_dbm.rb
+++ b/test/dbm/test_dbm.rb
@@ -86,14 +86,6 @@ if defined? DBM
assert_equal(DBM.open("tmptest_dbm") { :foo }, :foo)
end
- def test_s_open_error
- assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm", 0))
- assert_raise(Errno::EACCES, "NEVER MIND IF YOU USE Berkeley DB3") {
- DBM.open("tmptest_dbm", 0)
- }
- dbm.close
- end
-
def test_close
assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm"))
assert_nil(dbm.close)
diff --git a/test/xmlrpc/webrick_testing.rb b/test/xmlrpc/webrick_testing.rb
index a6830ce..eb054a7 100644
--- a/test/xmlrpc/webrick_testing.rb
+++ b/test/xmlrpc/webrick_testing.rb
@@ -23,14 +23,14 @@ module WEBrick_Testing
}
Timeout.timeout(5) {
- nil until @__started # wait until the server is ready
+ Thread.pass until @__started # wait until the server is ready
}
end
def stop_server
Timeout.timeout(5) {
@__server.shutdown
- nil while @__started # wait until the server is down
+ Thread.pass while @__started # wait until the server is down
}
@__server = nil
end