From: John Snow <jsnow@redhat.com>
Date: Tue, 19 Oct 2021 14:49:12 +0000 (-0400)
Subject: iotests/297: update tool availability checks
X-Git-Tag: qemu-xen-4.17.0-rc4~259^2~13
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7a90bcc269bb6f727cfd69b50128ecf4ab92e9af;p=qemu-xen.git

iotests/297: update tool availability checks

As mentioned in 'iotests/297: Don't rely on distro-specific linter
binaries', these checks are overly strict. Update them to be in-line
with how we actually invoke the linters themselves.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-id: 20211019144918.3159078-10-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---

diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index 76d6a23f53..b2ad8d1cbe 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -18,7 +18,6 @@
 
 import os
 import re
-import shutil
 import subprocess
 import sys
 from typing import List, Mapping, Optional
@@ -84,9 +83,11 @@ def run_linter(
 
 
 def main() -> None:
-    for linter in ('pylint-3', 'mypy'):
-        if shutil.which(linter) is None:
-            iotests.notrun(f'{linter} not found')
+    for linter in ('pylint', 'mypy'):
+        try:
+            run_linter(linter, ['--version'], suppress_output=True)
+        except subprocess.CalledProcessError:
+            iotests.notrun(f"'{linter}' not found")
 
     files = get_test_files()