From a069181d747d3ff9e034031ec2bdf5d119e41a34 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Thu, 13 Dec 2018 15:22:31 +0100 Subject: [PATCH] comparators: try matching for MozillaZipFile before ZipFile Fixes a test failure in Alpine Linux. Signed-off-by: Mattia Rizzolo --- diffoscope/comparators/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diffoscope/comparators/__init__.py b/diffoscope/comparators/__init__.py index cc33a26..71f9861 100644 --- a/diffoscope/comparators/__init__.py +++ b/diffoscope/comparators/__init__.py @@ -85,8 +85,8 @@ class ComparatorManager(object): ('odt.OdtFile',), ('ocaml.OcamlInterfaceFile',), ('docx.DocxFile',), - ('zip.ZipFile',), ('zip.MozillaZipFile',), + ('zip.ZipFile',), ('image.JPEGImageFile',), ('image.ICOImageFile',), ('cbfs.CbfsFile',), -- 2.19.2 From 5f50be792e0fed289c4470fc668ebb613723cb89 Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Sat, 15 Dec 2018 23:05:52 +0100 Subject: [PATCH] Fix a test_mozzip_compressed_files test failure under Alpine Linux. (Closes: #916353, reproducible-builds/diffoscope#8) --- tests/comparators/test_zip.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/comparators/test_zip.py b/tests/comparators/test_zip.py index 413ffd3..ab55429 100644 --- a/tests/comparators/test_zip.py +++ b/tests/comparators/test_zip.py @@ -105,10 +105,10 @@ def test_mozzip_metadata(mozzip_differences, mozzip1, mozzip2): @skip_unless_tools_exist('zipinfo') def test_mozzip_compressed_files(mozzip_differences): - assert mozzip_differences[1].source1 == 'dir/text' - assert mozzip_differences[1].source2 == 'dir/text' + assert mozzip_differences[-1].source1 == 'dir/text' + assert mozzip_differences[-1].source2 == 'dir/text' expected_diff = get_data('text_ascii_expected_diff') - assert mozzip_differences[1].unified_diff == expected_diff + assert mozzip_differences[-1].unified_diff == expected_diff @skip_unless_tools_exist('zipinfo') -- 2.19.2