[Git][reproducible-builds/diffoscope][master] Move to assert_diff in test_apk.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
c1a43a29 by Chris Lamb at 2021-02-11T11:15:01+00:00
Move to assert_diff in test_apk.

- - - - -


1 changed file:

- tests/comparators/test_apk.py


Changes:

=====================================
tests/comparators/test_apk.py
=====================================
@@ -23,7 +23,7 @@ import subprocess
 
 from diffoscope.comparators.apk import ApkFile
 
-from ..utils.data import load_fixture, get_data
+from ..utils.data import load_fixture, assert_diff
 from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 from ..utils.nonexisting import assert_non_existing
 
@@ -68,8 +68,7 @@ def test_compare_non_existing(monkeypatch, apk1):
 def test_zipinfo(differences):
     assert differences[0].source1 == "zipinfo {}"
     assert differences[0].source2 == "zipinfo {}"
-    expected_diff = get_data("apk_zipinfo_expected_diff")
-    assert differences[0].unified_diff == expected_diff
+    assert_diff(differences[0], "apk_zipinfo_expected_diff")
 
 
 @skip_unless_tools_exist("zipinfo")
@@ -80,8 +79,7 @@ def test_zipinfo(differences):
 def test_android_manifest(differences):
     assert differences[1].source1 == "AndroidManifest.xml (decoded)"
     assert differences[1].source2 == "AndroidManifest.xml (decoded)"
-    expected_diff = get_data("apk_manifest_expected_diff")
-    assert differences[1].details[0].unified_diff == expected_diff
+    assert_diff(differences[1].details[0], "apk_manifest_expected_diff")
 
 
 @skip_unless_tools_exist("apktool", "zipinfo")



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/c1a43a290f8143fd3edb5777ef514621dc5681f0
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/20210211/35b96510/attachment.htm>