[Git][reproducible-builds/diffoscope][master] Use @skip_unless_tool_is_at_least ("at_least") over @skip_if_tool_version_is...

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
8c3e3eef by Chris Lamb at 2022-06-21T12:22:17+01:00
Use @skip_unless_tool_is_at_least ("at_least") over @skip_if_tool_version_is ("is") to fix tests on Debian stable.

- - - - -


1 changed file:

- tests/comparators/test_elf.py


Changes:

=====================================
tests/comparators/test_elf.py
=====================================
@@ -37,6 +37,7 @@ from ..utils.tools import (
     skip_if_binutils_does_not_support_x86,
     skip_unless_module_exists,
     skip_if_tool_version_is,
+    skip_unless_tool_is_at_least,
 )
 
 
@@ -94,7 +95,7 @@ def test_obj_compare_non_existing(monkeypatch, obj1):
 
 
 @skip_unless_tools_exist("readelf")
- at skip_if_tool_version_is("readelf", readelf_version, "2.38")
+ at skip_unless_tool_is_at_least("readelf", readelf_version, "2.38")
 @skip_if_binutils_does_not_support_x86()
 def test_diff(obj_differences):
     assert len(obj_differences) == 1
@@ -130,7 +131,7 @@ def lib_differences(lib1, lib2):
 
 
 @skip_unless_tools_exist("readelf", "objdump")
- at skip_if_tool_version_is("readelf", readelf_version, "2.38")
+ at skip_unless_tool_is_at_least("readelf", readelf_version, "2.38")
 @skip_if_binutils_does_not_support_x86()
 def test_lib_differences(lib_differences):
     assert len(lib_differences) == 2
@@ -172,7 +173,7 @@ def libmix_differences(libmix1, libmix2):
 @skip_unless_tools_exist("xxd")
 @skip_unless_tools_exist("llvm-readobj", "llvm-objdump")
 @skip_unless_tools_exist("readelf", "objdump")
- at skip_if_tool_version_is("readelf", readelf_version, "2.38")
+ at skip_unless_tool_is_at_least("readelf", readelf_version, "2.38")
 @skip_if_binutils_does_not_support_x86()
 def test_libmix_differences(libmix_differences):
     assert len(libmix_differences) == 5



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/8c3e3eefffcc29c70299022dc1d731568e6341e8
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/20220621/f5cb76a5/attachment.htm>