[diffoscope] 01/01: Device and RPM fallback comparisons needs xxd due to fixtures. (Closes: #854593)

Chris Lamb chris at chris-lamb.co.uk
Thu Feb 9 00:41:15 CET 2017


This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository diffoscope.

commit 56969119fa2480a2b26dd92167ee1dc26c27fc78
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Feb 9 12:31:35 2017 +1300

    Device and RPM fallback comparisons needs xxd due to fixtures. (Closes: #854593)
    
    Signed-off-by: Chris Lamb <lamby at debian.org>
---
 tests/comparators/test_device.py | 4 ++++
 tests/comparators/test_rpm.py    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/tests/comparators/test_device.py b/tests/comparators/test_device.py
index 51363cc..4ab1710 100644
--- a/tests/comparators/test_device.py
+++ b/tests/comparators/test_device.py
@@ -24,6 +24,8 @@ from diffoscope.comparators.device import Device
 from diffoscope.comparators.utils.specialize import specialize
 
 from utils.data import load_fixture, get_data
+from utils.tools import skip_unless_tools_exist
+
 
 text_ascii1 = load_fixture('text_ascii1')
 
@@ -42,10 +44,12 @@ def differences_reverse(text_ascii1, devnull):
 def test_identification(devnull):
     assert isinstance(devnull, Device)
 
+ at skip_unless_tools_exist('xxd')
 def test_diff(differences):
     expected_diff = get_data('device_expected_diff')
     assert differences.unified_diff == expected_diff
 
+ at skip_unless_tools_exist('xxd')
 def test_diff_reverse(differences_reverse):
     expected_diff = get_data('device_expected_diff_reverse')
     assert differences_reverse.unified_diff == expected_diff
diff --git a/tests/comparators/test_rpm.py b/tests/comparators/test_rpm.py
index d2724ed..0c13fd2 100644
--- a/tests/comparators/test_rpm.py
+++ b/tests/comparators/test_rpm.py
@@ -76,6 +76,7 @@ def test_content(differences):
 def test_compare_non_existing(monkeypatch, rpm1):
     assert_non_existing(monkeypatch, rpm1)
 
+ at skip_unless_tools_exist('xxd')
 def test_fallback_comparison(monkeypatch):
     manager = ComparatorManager()
     monkeypatch.setattr(manager, 'COMPARATORS', (

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git


More information about the diffoscope mailing list