1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make Pstore tests as optional

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2025-01-09 13:27:56 +09:00
parent 1089282acc
commit 3185550623
Notes: git 2025-01-10 01:20:01 +00:00 
Merged: https://github.com/ruby/ruby/pull/12537
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/cgi/session/pstore.rb
View File

@ -11,7 +11,10 @@
# cgi/session.rb for more details on session storage managers. # cgi/session.rb for more details on session storage managers.
require_relative '../session' require_relative '../session'
require 'pstore' begin
require 'pstore'
rescue LoadError
end
class CGI class CGI
class Session class Session
@ -82,7 +85,7 @@ class CGI
File::unlink path File::unlink path
end end
end end if defined?(::PStore)
end end
end end
# :enddoc: # :enddoc:

2
test/cgi/test_cgi_session.rb
View File

@ -91,7 +91,7 @@ class CGISessionTest < Test::Unit::TestCase
assert_equal(value1,session["key1"]) assert_equal(value1,session["key1"])
assert_equal(value2,session["key2"]) assert_equal(value2,session["key2"])
session.close session.close
end end if defined?(::PStore)
def test_cgi_session_specify_session_id def test_cgi_session_specify_session_id
update_env( update_env(
'REQUEST_METHOD' => 'GET', 'REQUEST_METHOD' => 'GET',

8
test/psych/test_yamlstore.rb
View File

@ -23,14 +23,18 @@ module Psych
class YAMLStoreTest < TestCase class YAMLStoreTest < TestCase
def setup def setup
if defined?(::PStore)
@dir = Dir.mktmpdir("rubytest-file") @dir = Dir.mktmpdir("rubytest-file")
File.chown(-1, Process.gid, @dir) File.chown(-1, Process.gid, @dir)
@yamlstore_file = make_tmp_filename("yamlstore") @yamlstore_file = make_tmp_filename("yamlstore")
@yamlstore = YAML::Store.new(@yamlstore_file) @yamlstore = YAML::Store.new(@yamlstore_file)
else
omit "PStore is not available"
end
end end
def teardown def teardown
FileUtils.remove_entry_secure @dir FileUtils.remove_entry_secure(@dir) if @dir
end end
def make_tmp_filename(prefix) def make_tmp_filename(prefix)
@ -97,5 +101,5 @@ module Psych
end end
end end
end end
end end if defined?(::PStore)
end if defined?(Psych) end if defined?(Psych)

6
test/yaml/test_store.rb
View File

@ -5,8 +5,12 @@ require 'tmpdir'
class YAMLStoreTest < Test::Unit::TestCase class YAMLStoreTest < Test::Unit::TestCase
def setup def setup
if defined?(::PStore)
@yaml_store_file = File.join(Dir.tmpdir, "yaml_store.tmp.#{Process.pid}") @yaml_store_file = File.join(Dir.tmpdir, "yaml_store.tmp.#{Process.pid}")
@yaml_store = YAML::Store.new(@yaml_store_file) @yaml_store = YAML::Store.new(@yaml_store_file)
else
omit "PStore is not available"
end
end end
def teardown def teardown
@ -177,4 +181,4 @@ class YAMLStoreTest < Test::Unit::TestCase
end end
assert_equal(indentation_3_yaml, File.read(@yaml_store_file), bug12800) assert_equal(indentation_3_yaml, File.read(@yaml_store_file), bug12800)
end end
end if defined?(::YAML::Store) end