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

SimpleTest: fix hashing the wrong file in test_merge if output: is given

Browse Source
This commit is contained in:
Moritz Bunkus 2015-12-29 14:00:13 +01:00
parent ac0ea76a6f
commit c967c6771a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,11 @@ class SimpleTest
@tmp ||= tmp_name
end
def clean_tmp
File.unlink(@tmp) if File.exists?(@tmp) && (ENV["KEEP_TMPFILES"] != "1")
@tmp = nil
end
def hash_file name
md5 name
end
@ -82,10 +87,7 @@ class SimpleTest
def hash_tmp erase = true
output = hash_file @tmp
if erase
File.unlink(@tmp) if File.exists?(@tmp) && (ENV["KEEP_TMPFILES"] != "1")
@tmp = nil
end
clean_tmp if erase
output
end
@ -112,7 +114,11 @@ class SimpleTest
:block => lambda {
output = options[:output] || tmp
merge full_command_line, :exit_code => options[:exit_code], :output => output
options[:exit_code] == :error ? 'error' : options[:keep_tmp] ? hash_file(output) : hash_tmp
result = options[:exit_code] == :error ? 'error' : hash_file(output)
clean_tmp unless options[:keep_tmp]
result
},
}
end