[Git][reproducible-builds/diffoscope][master] Fix compatibility with file 5.45. (Closes: reproducible-builds/diffoscope#351)

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
a0a02057 by Chris Lamb at 2023-09-07T10:40:24-07:00
Fix compatibility with file 5.45. (Closes: reproducible-builds/diffoscope#351)

The new version of file added new information about cpio archives, which
was then showing up in an (essentially unrelated) test.

Thanks, Vagrant and Jelle.

- - - - -


1 changed file:

- tests/comparators/test_fit.py


Changes:

=====================================
tests/comparators/test_fit.py
=====================================
@@ -27,7 +27,11 @@ from diffoscope.comparators.fit import FlattenedImageTreeFile
 from diffoscope.comparators.utils.specialize import specialize
 
 from ..utils.data import data, assert_diff, load_fixture
-from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
+from ..utils.tools import (
+    skip_unless_tools_exist,
+    skip_unless_tool_is_at_least,
+    skip_unless_file_version_is_at_least,
+)
 from ..utils.nonexisting import assert_non_existing
 
 cpio1 = load_fixture("test1.cpio")
@@ -123,20 +127,22 @@ def test_nested_listing(nested_differences):
 
 @skip_unless_tools_exist("cpio")
 @skip_unless_tool_is_at_least("dumpimage", dumpimage_version, "2021.01")
+ at skip_unless_file_version_is_at_least("5.45")
 @skip_unless_tools_exist("fdtdump")
 def test_nested_symlink(nested_differences):
-    assert nested_differences[1].source1 == "dir/link"
-    assert nested_differences[1].comment == "symlink"
-    assert_diff(nested_differences[1], "symlink_expected_diff")
+    assert nested_differences[2].source1 == "dir/link"
+    assert nested_differences[2].comment == "symlink"
+    assert_diff(nested_differences[2], "symlink_expected_diff")
 
 
 @skip_unless_tools_exist("cpio")
 @skip_unless_tool_is_at_least("dumpimage", dumpimage_version, "2021.01")
 @skip_unless_tools_exist("fdtdump")
+ at skip_unless_file_version_is_at_least("5.45")
 def test_nested_compressed_files(nested_differences):
-    assert nested_differences[2].source1 == "dir/text"
-    assert nested_differences[2].source2 == "dir/text"
-    assert_diff(nested_differences[2], "text_ascii_expected_diff")
+    assert nested_differences[3].source1 == "dir/text"
+    assert nested_differences[3].source2 == "dir/text"
+    assert_diff(nested_differences[3], "text_ascii_expected_diff")
 
 
 @skip_unless_tools_exist("cpio")



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/a0a020570492482fed42ac8e75858651387dcf78

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/a0a020570492482fed42ac8e75858651387dcf78
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20230907/d666e72d/attachment.htm>