third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore conversions_test() output differences on Windows

Browse Source
This commit is contained in:
LeoHsiao 2020-09-03 23:27:50 +08:00
parent daa2a6fda5
commit e976d3795a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/bash_tests/testcases.py
View File

@ -231,6 +231,15 @@ class TestCases(unittest.TestCase):
out += BT.execute('exiv2 -M"del Xmp.mwg-rs.Regions" DSC_3079.jpg')
out += BT.execute('exiv2 -px DSC_3079.jpg')
# Ignore the output differences on Windows
for pair in [
('charset="Jis"', 'charset=Jis'),
('charset="Unicode"', 'charset=Unicode'),
(' 9 Rocknroll', "11 Rock'n'roll"),
('Rocknroll', "Rock'n'roll")
]:
out = str(out).replace(pair[0], pair[1])
BT.reportTest('conversions', out)

2
tests/bash_tests/utils.py
View File

@ -476,7 +476,7 @@ def printTest(filename):
good_file = os.path.join(Config.data_dir, filename + '.ipgd')
copyTestFile(filename, test_file)
output = execute('iptcprint {src_file}', vars(), expected_returncodes=None, return_bytes=True)
output = output.replace(Config.data_dir.replace(os.path.sep, '/').encode(), b'../data') # Ignore the difference of data_dir
output = output.replace(Config.data_dir.replace(os.path.sep, '/').encode(), b'../data') # Ignore the difference of data_dir on Windows
save(output + b'\n', test_file)
return diffCheck(good_file, test_file, in_bytes=True)