Bug#841146: diffoscope: Failure of test_superblock

[HW42]

Leo Famulari:
> On Fri, Oct 21, 2016 at 04:23:51PM +0000, Mattia Rizzolo wrote:
>> Though I'm using pytest 3.0.3.
>> That test is skipped by using pytest.mark.skip(), which I don't see in
>> the docs of pytest for 2.7.
>> The changelog of pytest tells me pytest.mark.skip() is recognized as a
>> skipping marker starting from 2.9¹.  Is there any chance you can instead
>> upgrade pytest in your distribution?
> 
> We are working on upgrading the core Python packages like pytest and
> Setuptools but we can't do it overnight.
> 
>> If so I'll add a versioned dependency on setup.py, otherwies I can
>> always turn that pytest.mark.skip() into a pytest.mark.skipif(True),
>> which is IMHO ugly but quick and effective for solving this bug, I
>> think.  Can you also try to convert that marking in
>> tests/comparators/utils.py:49 to confirm?
> 
> I tried making the following change:
> 
> diff --git a/tests/comparators/utils.py b/tests/comparators/utils.py
> index f8f6399..acbdc9f 100644
> --- a/tests/comparators/utils.py
> +++ b/tests/comparators/utils.py
> @@ -46,7 +46,7 @@ def skip_unless_tools_exist(*required):
>  
>  def skip_unless_tool_is_older_than(tool, actual_ver, min_ver, vcls=LooseVersion):
>      if tools_missing(tool):
> -        return pytest.mark.skip(reason="requires {}".format(tool))
> +        return pytest.mark.skipif(True))

That's one closing paren to much.

>      if callable(actual_ver):
>          actual_ver = actual_ver()
>      return pytest.mark.skipif(
> 
> But, that creates a bunch of invalid syntax. Here's one:
[...]

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 825 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/reproducible-builds/attachments/20161022/e88c34b3/attachment.sig>