From e976d3795a174a9ba4422e3297ded179cf3e7c0c Mon Sep 17 00:00:00 2001 From: LeoHsiao Date: Thu, 3 Sep 2020 23:27:50 +0800 Subject: [PATCH] Ignore conversions_test() output differences on Windows --- tests/bash_tests/testcases.py | 9 +++++++++ tests/bash_tests/utils.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/bash_tests/testcases.py b/tests/bash_tests/testcases.py index 71fc6676..337ba7cd 100644 --- a/tests/bash_tests/testcases.py +++ b/tests/bash_tests/testcases.py @@ -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) diff --git a/tests/bash_tests/utils.py b/tests/bash_tests/utils.py index 29eac3da..a1a008ef 100644 --- a/tests/bash_tests/utils.py +++ b/tests/bash_tests/utils.py @@ -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)