Improve failing tests

Signed-off-by: tdruez <tdruez@nexb.com>

Author: tdruez

scanpipe/tests/pipes/test_scancode.py

@@ -79,11 +79,7 @@ def test_scanpipe_pipes_scancode_extract_archive_errors(self):
         errors = scancode.extract_archive(input_location, target)
 
         error_message = "gzip decompression failed"
-        if sys.platform == "darwin":
-            error_message += " (zlib returned error -3, msg invalid code lengths set)"
-
-        expected = {input_location: [error_message]}
-        self.assertEqual(expected, errors)
+        self.assertIn(error_message, errors[str(input_location)][0])
 
     def test_scanpipe_pipes_scancode_extract_archives(self):
         tempdir = Path(tempfile.mkdtemp())
@@ -113,11 +109,7 @@ def test_scanpipe_pipes_scancode_extract_archives_errors(self):
         errors = scancode.extract_archives(tempdir)
 
         error_message = "gzip decompression failed"
-        if sys.platform == "darwin":
-            error_message += " (zlib returned error -3, msg invalid code lengths set)"
-
-        expected = {str(target): [error_message]}
-        self.assertEqual(expected, errors)
+        self.assertIn(error_message, errors[str(target)][0])
 
     @skipIf(sys.platform != "linux", "QCOW2 extraction is not available on macOS.")
     def test_scanpipe_pipes_scancode_extract_archive_vmimage_qcow2(self):

scanpipe/tests/test_pipelines.py

@@ -535,6 +535,7 @@ class PipelinesIntegrationTest(TestCase):
         "file_type",
         # mime type and is_script are inconsistent across systems
         "mime_type",
+        "type",
         "is_script",
         "notes",
         "settings",