Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-23 11:27:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: don't hardcode path to temporary directory

Browse Source
This commit is contained in:
Moritz Bunkus 2021-07-06 19:05:15 +02:00
parent 0a96f4a19b
commit 15962e1b10
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/run.rb
View File

@ -90,5 +90,8 @@ EOHELP
exit controller.num_failed > 0 ? 1 : 0
end
setup
main
Dir.mktmpdir do |dir|
$temp_dir = dir
setup
main
end

6
tests/test.d/simple_test.rb
View File

@ -67,7 +67,7 @@ class SimpleTest
end
def tmp_name_prefix
[ "/tmp/mkvtoolnix-auto-test-#{self.class.name}", $$.to_s, Thread.current[:number] ].join("-") + "-"
[ "#{$temp_dir}/mkvtoolnix-auto-test-#{self.class.name}", $$.to_s, Thread.current[:number] ].join("-") + "-"
end
def tmp_name
@ -104,8 +104,8 @@ class SimpleTest
def unlink_tmp_files
return if ENV["KEEP_TMPFILES"] == "1"
re = %r{^#{self.tmp_name_prefix}}
Dir.entries("/tmp").each do |entry|
file = "/tmp/#{entry}"
Dir.entries($temp_dir).each do |entry|
file = "#{$temp_dir}/#{entry}"
File.unlink(file) if re.match(file) and File.exists?(file)
end
end

6
tests/test.d/test.rb
View File

@ -23,8 +23,8 @@ class Test
def unlink_tmp_files
return if (ENV["KEEP_TMPFILES"] == "1")
re = /^#{self.tmp_name_prefix}/
Dir.entries("/tmp").each do |entry|
file = "/tmp/#{entry}"
Dir.entries($temp_dir).each do |entry|
file = "#{$temp_dir}/#{entry}"
File.unlink(file) if re.match(file) and File.exists?(file)
end
end
@ -59,7 +59,7 @@ class Test
end
def tmp_name_prefix
[ "/tmp/mkvtoolnix-auto-test", $$.to_s, Thread.current[:number] ].join("-") + "-"
[ "#{$temp_dir}/mkvtoolnix-auto-test", $$.to_s, Thread.current[:number] ].join("-") + "-"
end
def tmp_name