Skip to content

Commit bd2de9c

Browse files
authored
[test] Rename EMTEST_SKIP_CARGO -> EMTEST_SKIP_RUST. NFC (#22982)
See #22964
1 parent 319b423 commit bd2de9c

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

test/test_other.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,19 +142,23 @@ def metafunc(self, backend, *args, **kwargs):
142142
return metafunc
143143

144144

145-
def requires_tool(tool):
145+
def requires_tool(tool, env_name=None):
146146
assert not callable(tool)
147147

148148
def decorate(func):
149149
assert callable(func)
150150

151151
@wraps(func)
152152
def decorated(self, *args, **kwargs):
153+
if env_name:
154+
env_var = f'EMTEST_SKIP_{env_name}'
155+
else:
156+
env_var = f'EMTEST_SKIP_{tool.upper()}'
153157
if not shutil.which(tool):
154-
if f'EMTEST_SKIP_{tool.upper()}' in os.environ:
155-
self.skipTest(f'test requires ccache and EMTEST_SKIP_{tool.upper()} is set')
158+
if env_var in os.environ:
159+
self.skipTest(f'test requires ccache and {env_var} is set')
156160
else:
157-
self.fail(f'{tool} required to run this test. Use EMTEST_SKIP_{tool.upper()} to skip')
161+
self.fail(f'{tool} required to run this test. Use {env_var} to skip')
158162
return func(self, *args, **kwargs)
159163

160164
return decorated
@@ -174,7 +178,7 @@ def requires_scons(func):
174178

175179
def requires_rust(func):
176180
assert callable(func)
177-
return requires_tool('cargo')(func)
181+
return requires_tool('cargo', 'RUST')(func)
178182

179183

180184
def requires_pkg_config(func):

0 commit comments

Comments
 (0)