Make test more robust to output changes

Author: terriko

test/test_cli.py

@@ -109,11 +109,7 @@ def test_skips(self):
         """Tests the skips option"""
 
         logger = logging.getLogger()
-        test_path = os.path.join(
-            os.path.abspath(os.path.dirname(__file__)),
-            "binaries",
-            "test-sqlite-3.12.2.out",
-        )
+        test_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "csv")
 
         skip_checkers = ["systemd", "xerces", "xml2", "kerberos"]
         include_checkers = ["expat", "libgcrypt", "openssl", "sqlite"]
@@ -122,7 +118,9 @@ def test_skips(self):
             main(["cve-bin-tool", test_path, "-s", ",".join(skip_checkers)])
 
         # The final log has all the checkers detected
-        final_log = cm.output[1]
+        final_log = [i for i in cm.output if "Checkers:" in i]
+        self.assertTrue(len(final_log) > 0, "Could not find checkers line in log")
+        final_log = final_log[0]
         for checker in skip_checkers:
             self.assertTrue(
                 checker not in final_log, "found skipped checker {}".format(checker)
@@ -139,7 +137,9 @@ def test_skips(self):
         with self.assertLogs(logger, logging.INFO) as cm:
             main(["cve-bin-tool", test_path, "-s", ",".join(skip_checkers)])
 
-        final_log = cm.output[1]
+        final_log = [i for i in cm.output if "Checkers:" in i]
+        self.assertTrue(len(final_log) > 0, "Could not find checkers line in log")
+        final_log = final_log[0]
         for checker in skip_checkers:
             self.assertTrue(
                 checker not in final_log, "found skipped checker {}".format(checker)