[Git][reproducible-builds/diffoscope][master] 2 commits: Simplify tests_quines.py::test_{differences,differences_deb} to simply use...

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
fef20236 by Chris Lamb at 2024-12-04T11:03:36+00:00
Simplify tests_quines.py::test_{differences,differences_deb} to simply use assert_diff and not mangle the test fixture.

- - - - -
06f00adc by Chris Lamb at 2024-12-04T11:04:06+00:00
Update tests to support file 5.46. (Closes: reproducible-builds/diffoscope#395)

- - - - -


2 changed files:

- tests/data/quine_expected_diff
- tests/test_quines.py


Changes:

=====================================
tests/data/quine_expected_diff
=====================================
@@ -1,3 +1,3 @@
 @@ -1 +1 @@
 -gzip compressed data, was "recursive", from FAT filesystem (MS-DOS, OS/2, NT)
-+Zip archive data, at least v2.0 to extract
++Zip archive data, made by v2.0, extract using at least v2.0, last modified, last modified Sun, Mar 04 2010 00:24:16, uncompressed size 440, method=deflate


=====================================
tests/test_quines.py
=====================================
@@ -22,7 +22,7 @@ from diffoscope.comparators.deb import DebFile
 from diffoscope.comparators.zip import ZipFile
 from diffoscope.comparators.gzip import GzipFile
 
-from .utils.data import load_fixture, get_data
+from .utils.data import load_fixture, assert_diff
 from .utils.tools import (
     skip_unless_file_version_is_at_least,
     file_version_is_ge,
@@ -54,13 +54,9 @@ def differences(quine1, quine2):
     return quine1.compare(quine2).details
 
 
- at skip_unless_file_version_is_at_least("5.37")
+ at skip_unless_file_version_is_at_least("5.46")
 def test_difference(differences):
-    expected_diff = get_data("quine_expected_diff")
-    if file_version_is_ge("5.40"):
-        expected_diff = expected_diff[:-1]
-        expected_diff += ", compression method=deflate\n"
-    assert differences[0].unified_diff == expected_diff
+    assert_diff(differences[0], "quine_expected_diff")
 
 
 def test_identification_deb(quine3, quine4):
@@ -74,5 +70,4 @@ def differences_deb(quine3, quine4):
 
 
 def test_differences_deb(differences_deb):
-    expected_diff = get_data("quine_deb_expected_diff")
-    assert differences_deb[0].unified_diff == expected_diff
+    assert_diff(differences_deb[0], "quine_deb_expected_diff")



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/c77aedc9e7227553de2db184b8f6086bc8f9f75b...06f00adc3d184c7c54bcce5c5da9ad07cff8428d

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/c77aedc9e7227553de2db184b8f6086bc8f9f75b...06f00adc3d184c7c54bcce5c5da9ad07cff8428d
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/20241204/dc43d19a/attachment.htm>