[diffoscope] 02/02: ps2ascii > 9.21 now varies on timezone, so temporarily skip this test for now.

[Chris Lamb]

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

lamby pushed a commit to branch master
in repository diffoscope.

commit b8bcb4623501c243709c65cb551853ffa619e4f8
Author: Chris Lamb <lamby at debian.org>
Date:   Mon Oct 9 19:44:40 2017 +0100

    ps2ascii > 9.21 now varies on timezone, so temporarily skip this test for now.
---
 tests/comparators/test_ps.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/comparators/test_ps.py b/tests/comparators/test_ps.py
index 568fe38..572b7e1 100644
--- a/tests/comparators/test_ps.py
+++ b/tests/comparators/test_ps.py
@@ -18,11 +18,12 @@
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
 import pytest
+import subprocess
 
 from diffoscope.comparators.ps import PsFile
 
 from ..utils.data import load_fixture, get_data
-from ..utils.tools import skip_unless_tools_exist
+from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_most
 from ..utils.nonexisting import assert_non_existing
 
 
@@ -30,6 +31,10 @@ ps1 = load_fixture('test1.ps')
 ps2 = load_fixture('test2.ps')
 
 
+def ps2ascii_version():
+    return subprocess.check_output(('ps2ascii', '--version')).decode('utf-8')
+
+
 def test_identification(ps1):
     assert isinstance(ps1, PsFile)
 
@@ -50,7 +55,7 @@ def test_internal_diff(differences):
     assert differences.unified_diff == expected_diff
 
 
- at skip_unless_tools_exist('ps2ascii')
+ at skip_unless_tool_is_at_most('ps2ascii', ps2ascii_version, '9.21')
 def test_text_diff(differences):
     expected_diff = get_data('ps_text_expected_diff')
     assert differences.details[0].unified_diff == expected_diff

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