zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Clean up settings test to plug occasional failure bug

Browse source
This commit is contained in:
Kyle Drake 2014-09-16 01:48:29 -07:00
parent e92f13728d
commit 698c602475
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tests/acceptance/settings_tests.rb
View file

@ -64,25 +64,17 @@ def generate_ssl_certs(opts={})
our_cert_tmpfile.close our_cert_tmpfile.close
res[:cert_path] = our_cert_tmpfile.path res[:cert_path] = our_cert_tmpfile.path
our_cert_keypair_tmpfile = Tempfile.new 'our_cert_keypair' res[:key_path] = '/tmp/nc_test_our_cert_keypair'
our_cert_keypair_tmpfile.write our_cert_keypair.to_pem File.write res[:key_path], our_cert_keypair.to_pem
our_cert_keypair_tmpfile.close
res[:key_path] = our_cert_keypair_tmpfile.path
ca_cert_tmpfile = Tempfile.new 'ca_cert' res[:cert_intermediate_path] = '/tmp/nc_test_ca_cert'
ca_cert_tmpfile.write res[:ca_cert].to_pem File.write res[:cert_intermediate_path], res[:ca_cert].to_pem
ca_cert_tmpfile.close
res[:cert_intermediate_path] = ca_cert_tmpfile.path
combined_cert_tmpfile = Tempfile.new 'combined_cert' res[:combined_cert_path] = '/tmp/nc_test_combined_cert'
combined_cert_tmpfile.write "#{File.read(res[:cert_path])}\n#{File.read(res[:cert_intermediate_path])}" File.write res[:combined_cert_path], "#{File.read(res[:cert_path])}\n#{File.read(res[:cert_intermediate_path])}"
combined_cert_tmpfile.close
res[:combined_cert_path] = combined_cert_tmpfile.path
bad_combined_cert_tmpfile = Tempfile.new 'bad_combined_cert' res[:bad_combined_cert_path] = '/tmp/nc_test_bad_combined_cert'
bad_combined_cert_tmpfile.write "#{File.read(res[:cert_intermediate_path])}\n#{File.read(res[:cert_path])}" File.write res[:bad_combined_cert_path], "#{File.read(res[:cert_intermediate_path])}\n#{File.read(res[:cert_path])}"
bad_combined_cert_tmpfile.close
res[:bad_combined_cert_path] = bad_combined_cert_tmpfile.path
res res
end end