[Git][reproducible-builds/diffoscope][master] test_icc: Calculate the path to a test .icc file using data() rather than using…

Chris Lamb gitlab at salsa.debian.org
Wed Dec 12 15:08:30 CET 2018


Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
a4c38a60 by Chris Lamb at 2018-12-12T14:05:21Z
test_icc: Calculate the path to a test .icc file using data() rather than using the pytest fixture to avoid a "Fixtures are not meant to be called directly" warning/error. (Closes: #916226)

- - - - -


1 changed file:

- tests/comparators/test_icc.py


Changes:

=====================================
tests/comparators/test_icc.py
=====================================
@@ -24,7 +24,7 @@ from diffoscope.config import Config
 from diffoscope.comparators.icc import IccFile
 from diffoscope.comparators.missing_file import MissingFile
 
-from ..utils.data import load_fixture, get_data
+from ..utils.data import load_fixture, get_data, data
 from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 
 
@@ -50,7 +50,7 @@ def cd_iccdump_version():
     somewhat-arbitrary newline too.
     """
 
-    val = subprocess.check_output(('cd-iccdump', icc1().path)).decode('utf-8')
+    val = subprocess.check_output(('cd-iccdump', data('test1.icc'))).decode('utf-8')
 
     for x in val.splitlines():
         if x.startswith('  Profile ID') and len(x) == 47:



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/a4c38a60fe505de772f0d9ced5cca1ca5df540ba
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/20181212/52e5dac0/attachment.html>


More information about the rb-commits mailing list