3
3
import pytest
4
4
from itertools import product
5
5
6
- from cpp_linter_hooks .util import ensure_installed , DEFAULT_CLANG_VERSION
6
+ from cpp_linter_hooks .util import is_installed , ensure_installed , DEFAULT_CLANG_VERSION
7
7
8
8
9
9
VERSIONS = [None , "16" ]
10
10
TOOLS = ["clang-format" , "clang-tidy" ]
11
11
12
12
13
- @pytest .mark .skip (reason = "see https://github.com/cpp-linter/cpp-linter-hooks/pull/29" )
13
+ clang_tools_installed = pytest .mark .skipif (
14
+ is_installed ('clang-format' , '13' ) or is_installed ('clang-tidy' , '13' ),
15
+ reason = "https://github.com/cpp-linter/cpp-linter-hooks/pull/29#issuecomment-1952873903" ,
16
+ )
17
+
18
+
19
+ @clang_tools_installed
14
20
@pytest .mark .parametrize (("tool" , "version" ), list (product (TOOLS , VERSIONS )))
15
21
def test_ensure_installed (tool , version , tmp_path , monkeypatch , caplog ):
16
22
@@ -23,10 +29,10 @@ def test_ensure_installed(tool, version, tmp_path, monkeypatch, caplog):
23
29
caplog .clear ()
24
30
caplog .set_level (logging .INFO , logger = "cpp_linter_hooks.util" )
25
31
26
- if version is not None :
27
- ensure_installed (tool , version = version )
28
- else :
32
+ if version is None :
29
33
ensure_installed (tool )
34
+ else :
35
+ ensure_installed (tool , version = version )
30
36
31
37
bin_version = version or DEFAULT_CLANG_VERSION
32
38
assert (bin_path / f"{ tool } -{ bin_version } " ).is_file ()
0 commit comments