tests: Deal with warnings in output

Do not assume a known length of output when checking it. Only assume that meta information about oletool used is first. Ignore warnings and messages that come after that to identify the actual result we want to check.

tests: Deal with warnings in output
Do not assume a known length of output when checking it. Only assume that meta information about oletool used is first. Ignore warnings and messages that come after that to identify the actual result we want to check.
Christian Herdtweck
1 parent 26f922b5
Showing 2 changed files with 18 additions and 13 deletions
tests/olevba/test_basic.py
tests/olevba/test_crypto.py
@@ -120,10 +120,14 @@ class TestOlevbaBasic(unittest.TestCase):
                                                  args=[full_name, ] + ADD_ARGS,
                                                  accept_nonzero_exit=True)
             output = json.loads(out_str)
-            self.assertEqual(len(output), 2)
+            self.assertGreaterEqual(len(output), 2)
             self.assertEqual(output[0]['type'], 'MetaInformation')
             self.assertEqual(output[0]['script_name'], 'olevba')
-            result = output[1]
+            for entry in output[1:]:
+                if entry['type'] in ('msg', 'warning'):
+                    continue    # ignore messages
+                result = entry
+                break
             self.assertTrue(result['json_conversion_successful'])
             if suffix in ('.xlsb', '.xltm', '.xlsm'):
                 # TODO: cannot extract xlm macros for these types yet
@@ -40,7 +40,7 @@ class OlevbaCryptoWriteProtectTest(unittest.TestCase):
                                          exclude_stderr=True)
             data = json.loads(output, object_pairs_hook=OrderedDict)
             # debug: json.dump(data, sys.stdout, indent=4)
-            self.assertIn(len(data), (3, 4))
+            self.assertGreaterEqual(len(data), 3)
             # first 2 parts: general info about script and file
             self.assertIn('script_name', data[0])
@@ -53,22 +53,23 @@ class OlevbaCryptoWriteProtectTest(unittest.TestCase):
             self.assertEqual(data[1]['type'], 'OLE')
             self.assertTrue(data[1]['json_conversion_successful'])
-            # possible VBA stomping warning
-            if len(data) == 4:
-                self.assertEqual(data[2]['type'], 'msg')
-                self.assertIn('VBA stomping', data[2]['msg'])
+            for entry in data[2:]:
+                if entry['type'] in ('msg', 'warning'):
+                    continue
+                result = entry
+                break
             # last part is the actual result
-            self.assertEqual(data[-1]['container'], example_file)
-            self.assertNotEqual(data[-1]['file'], example_file)
-            self.assertEqual(data[-1]['type'], "OpenXML")
-            analysis = data[-1]['analysis']
+            self.assertEqual(result['container'], example_file)
+            self.assertNotEqual(result['file'], example_file)
+            self.assertEqual(result['type'], "OpenXML")
+            analysis = result['analysis']
             self.assertEqual(analysis[0]['type'], 'AutoExec')
             self.assertEqual(analysis[0]['keyword'], 'Auto_Open')
-            macros = data[-1]['macros']
+            macros = result['macros']
             self.assertEqual(macros[0]['vba_filename'], 'Modul1.bas')
             self.assertIn('Sub Auto_Open()', macros[0]['code'])
-            self.assertTrue(data[-1]['json_conversion_successful'])
+            self.assertTrue(result['json_conversion_successful'])
 if __name__ == '__main__':