diff --git a/tests/oleid/test_basic.py b/tests/oleid/test_basic.py index c89a8026..99275b6a 100644 --- a/tests/oleid/test_basic.py +++ b/tests/oleid/test_basic.py @@ -68,13 +68,14 @@ def test_properties(self): self.assertEqual(value_dict['author'], b'\xb1\xe8\xb1\xe2\xc1\xa4;kijeong') elif join('olevba', 'sample_with_vba.ppt') in filename: - print('\nTODO: find reason for different results for sample_with_vba.ppt') - # on korean test machine, this is the result: - # self.assertEqual(value_dict['codepage'], - # '949: ANSI/OEM Korean (Unified Hangul Code)') - # self.assertEqual(value_dict['author'], - # b'\xb1\xe8 \xb1\xe2\xc1\xa4') - continue + self.assertEqual(value_dict['codepage'], + '949: ANSI/OEM Korean (Unified Hangul Code)', + 'Unexpected result {0!r} for codepage of sample {1}' + .format(value_dict['codepage'], filename)) + self.assertEqual(value_dict['author'], + b'\xb1\xe8 \xb1\xe2\xc1\xa4', + 'Unexpected result {0!r} for author of sample {1}' + .format(value_dict['author'], filename)) else: self.assertEqual(value_dict['codepage'], '1252: ANSI Latin 1; Western European (Windows)', @@ -121,8 +122,6 @@ def test_macros(self): join('oleform', 'oleform-PR314.docm'), join('basic', 'empty'), # WTF? join('basic', 'text'), - ) - todo_inconsistent_results = ( join('olevba', 'sample_with_vba.ppt'), ) for filename, value_dict in self.oleids: @@ -138,10 +137,6 @@ def test_macros(self): self.assertIn(value_dict['xlm'], ('Unknown', 'No')) # "macro detection" in text files leads to interesting results: - if filename in todo_inconsistent_results: - print("\nTODO: need to determine result inconsistency for sample {0}" - .format(filename)) - continue if filename in find_vba: # no macros! self.assertEqual(value_dict['vba'], 'Yes') else: