Skip to content
This repository was archived by the owner on Dec 27, 2023. It is now read-only.

Commit d46aedc

Browse files
acervacerv
committed
Fix misspelling of "tainted" word
Signed-off-by: Andrea Cervesato <[email protected]>
1 parent e565c27 commit d46aedc

File tree

5 files changed

+54
-53
lines changed

5 files changed

+54
-53
lines changed

‎ltp/dispatcher.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -360,12 +360,12 @@ def _run_test(self, test: Test) -> TestResults:
360360

361361
test_data = None
362362

363-
# check for tained kernel status
364-
tained_code_before, tained_msg_before = self._sut.get_tained_info()
365-
if tained_msg_before:
366-
for msg in tained_msg_before:
367-
ltp.events.fire("kernel_tained", msg)
368-
self._logger.debug("Kernel tained before test: %s", msg)
363+
# check for tainted kernel status
364+
tainted_code_before, tainted_msg_before = self._sut.get_tainted_info()
365+
if tainted_msg_before:
366+
for msg in tainted_msg_before:
367+
ltp.events.fire("kernel_tainted", msg)
368+
self._logger.debug("Kernel tainted before test: %s", msg)
369369

370370
timed_out = False
371371
reboot = False
@@ -396,14 +396,15 @@ def _run_test(self, test: Test) -> TestResults:
396396
self._logger.debug("Kernel panic recognized")
397397

398398
if not reboot:
399-
# check again for tained kernel and if tained status has changed
399+
# check again for tainted kernel and if tainted status has changed
400400
# just raise an exception and reboot the SUT
401-
tained_code_after, tained_msg_after = self._sut.get_tained_info()
402-
if tained_code_before != tained_code_after:
401+
tainted_code_after, tainted_msg_after = \
402+
self._sut.get_tainted_info()
403+
if tainted_code_before != tainted_code_after:
403404
reboot = True
404-
for msg in tained_msg_after:
405-
ltp.events.fire("kernel_tained", msg)
406-
self._logger.debug("Kernel tained after test: %s", msg)
405+
for msg in tainted_msg_after:
406+
ltp.events.fire("kernel_tainted", msg)
407+
self._logger.debug("Kernel tainted after test: %s", msg)
407408

408409
if timed_out:
409410
test_data = {

‎ltp/sut.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def flush(self) -> None:
4545
raise NotImplementedError()
4646

4747

48-
TAINED_MSG = [
48+
TAINTED_MSG = [
4949
"proprietary module was loaded",
5050
"module was force loaded",
5151
"kernel running on an out of specification system",
@@ -242,25 +242,25 @@ def _run_cmd(cmd: str) -> str:
242242

243243
return ret
244244

245-
def get_tained_info(self) -> set:
245+
def get_tainted_info(self) -> set:
246246
"""
247-
Return information about kernel if tained.
247+
Return information about kernel if tainted.
248248
:returns: set(int, list[str]),
249249
"""
250250
ret = self.run_command("cat /proc/sys/kernel/tainted", timeout=3)
251251
if ret["returncode"] != 0:
252-
raise SUTError("Can't read tained kernel information")
252+
raise SUTError("Can't read tainted kernel information")
253253

254254
stdout = ret["stdout"].rstrip()
255255

256-
tained_num = len(TAINED_MSG)
256+
tainted_num = len(TAINTED_MSG)
257257
code = int(stdout.rstrip())
258-
bits = format(code, f"0{tained_num}b")[::-1]
258+
bits = format(code, f"0{tainted_num}b")[::-1]
259259

260260
messages = []
261-
for i in range(0, tained_num):
261+
for i in range(0, tainted_num):
262262
if bits[i] == "1":
263-
msg = TAINED_MSG[i]
263+
msg = TAINTED_MSG[i]
264264
messages.append(msg)
265265

266266
return code, messages

‎ltp/tests/sut.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ def test_get_info(self, sut):
7171
assert info["kernel"]
7272
assert info["arch"]
7373

74-
def test_get_tained_info(self, sut):
74+
def test_get_tainted_info(self, sut):
7575
"""
76-
Test get_tained_info.
76+
Test get_tainted_info.
7777
"""
7878
sut.communicate(iobuffer=Printer())
79-
code, messages = sut.get_tained_info()
79+
code, messages = sut.get_tainted_info()
8080

8181
assert code >= 0
8282
assert isinstance(messages, list)

‎ltp/tests/test_dispatcher.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def test_exec_suites_bad_args(self, tmpdir, sut):
131131
ltpdir=str(tmpdir / "ltp"),
132132
sut=sut)
133133

134-
sut.get_tained_info = MagicMock(return_value=(0, ""))
134+
sut.get_tainted_info = MagicMock(return_value=(0, ""))
135135

136136
try:
137137
with pytest.raises(ValueError):
@@ -152,7 +152,7 @@ def test_exec_suites(self, tmpdir, sut):
152152
ltpdir=str(tmpdir / "ltp"),
153153
sut=sut)
154154

155-
sut.get_tained_info = MagicMock(return_value=(0, ""))
155+
sut.get_tainted_info = MagicMock(return_value=(0, ""))
156156

157157
try:
158158
results = dispatcher.exec_suites(suites=["dirsuite0", "dirsuite2"])
@@ -194,7 +194,7 @@ def stop_exec_suites(_):
194194

195195
ltp.events.register("test_started", stop_exec_suites)
196196

197-
sut.get_tained_info = MagicMock(return_value=(0, ""))
197+
sut.get_tainted_info = MagicMock(return_value=(0, ""))
198198

199199
results = dispatcher.exec_suites(suites=["dirsuite0", "dirsuite2"])
200200

@@ -212,7 +212,7 @@ def test_exec_suites_all(self, tmpdir, sut):
212212
ltpdir=str(tmpdir / "ltp"),
213213
sut=sut)
214214

215-
sut.get_tained_info = MagicMock(return_value=(0, ""))
215+
sut.get_tainted_info = MagicMock(return_value=(0, ""))
216216

217217
try:
218218
results = dispatcher.exec_suites(suites=[
@@ -289,7 +289,7 @@ def test_exec_suites_suite_timeout(self, tmpdir, sut):
289289
suite_timeout=0.5,
290290
test_timeout=15)
291291

292-
sut.get_tained_info = MagicMock(return_value=(0, ""))
292+
sut.get_tainted_info = MagicMock(return_value=(0, ""))
293293

294294
try:
295295
with pytest.raises(SuiteTimeoutError):
@@ -315,7 +315,7 @@ def test_exec_suites_test_timeout(self, tmpdir, sut):
315315
suite_timeout=15,
316316
test_timeout=0.5)
317317

318-
sut.get_tained_info = MagicMock(return_value=(0, ""))
318+
sut.get_tainted_info = MagicMock(return_value=(0, ""))
319319

320320
try:
321321
ret = dispatcher.exec_suites(suites=["sleepsuite"])
@@ -325,9 +325,9 @@ def test_exec_suites_test_timeout(self, tmpdir, sut):
325325
assert ret[0].tests_results[0].return_code == -1
326326

327327
@pytest.mark.usefixtures("prepare_tmpdir")
328-
def test_kernel_tained(self, tmpdir, sut):
328+
def test_kernel_tainted(self, tmpdir, sut):
329329
"""
330-
Test tained kernel recognition.
330+
Test tainted kernel recognition.
331331
"""
332332
ltpdir = tmpdir / "ltp"
333333

@@ -338,46 +338,46 @@ def test_kernel_tained(self, tmpdir, sut):
338338
suite_timeout=0.5,
339339
test_timeout=15)
340340

341-
class TainChecker:
341+
class TaintChecker:
342342
def __init__(self, dispatcher, bit, msg) -> None:
343343
self._dispatcher = dispatcher
344344
self._bit = bit
345345
self._msg = msg
346346
self._first = True
347-
self.tained_msg = queue.Queue()
347+
self.tainted_msg = queue.Queue()
348348
self.rebooted = queue.Queue()
349349

350-
def kernel_tained(self, msg: str):
350+
def kernel_tainted(self, msg: str):
351351
if self._first:
352352
self._first = False
353353

354-
# now we change tained information to trigger
354+
# now we change tainted information to trigger
355355
# sut_restart event
356-
sut.get_tained_info = MagicMock(
356+
sut.get_tainted_info = MagicMock(
357357
return_value=(self._bit, [self._msg]))
358358
else:
359-
self.tained_msg.put(msg)
359+
self.tainted_msg.put(msg)
360360

361361
def sut_restart(self, name: str):
362362
self.rebooted.put(True)
363363

364364
try:
365365
for i in range(0, 18):
366366
bit = math.pow(2, i)
367-
msg = ltp.sut.TAINED_MSG[i]
367+
msg = ltp.sut.TAINTED_MSG[i]
368368

369-
sut.get_tained_info = MagicMock(return_value=(0, [""]))
369+
sut.get_tainted_info = MagicMock(return_value=(0, [""]))
370370

371-
checker = TainChecker(dispatcher, bit, msg)
372-
ltp.events.register("kernel_tained", checker.kernel_tained)
371+
checker = TaintChecker(dispatcher, bit, msg)
372+
ltp.events.register("kernel_tainted", checker.kernel_tainted)
373373
ltp.events.register("sut_restart", checker.sut_restart)
374374

375375
dispatcher.exec_suites(suites=["dirsuite0"])
376376

377-
assert checker.tained_msg.get() == msg
377+
assert checker.tainted_msg.get() == msg
378378
assert checker.rebooted.get()
379379

380-
ltp.events.unregister("kernel_tained")
380+
ltp.events.unregister("kernel_tainted")
381381
ltp.events.unregister("sut_restart")
382382
finally:
383383
sut.stop()
@@ -404,7 +404,7 @@ def test_kernel_panic(self, tmpdir, sut):
404404
suite_timeout=10,
405405
test_timeout=10)
406406

407-
sut.get_tained_info = MagicMock(return_value=(0, ""))
407+
sut.get_tainted_info = MagicMock(return_value=(0, ""))
408408

409409
class PanicChecker:
410410
def __init__(self) -> None:

‎ltp/ui.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,12 @@ def __init__(self, no_colors: bool = False) -> None:
192192

193193
self._sut_not_responding = False
194194
self._kernel_panic = False
195-
self._kernel_tained = None
195+
self._kernel_tainted = None
196196
self._timed_out = False
197197

198198
ltp.events.register("sut_not_responding", self.sut_not_responding)
199199
ltp.events.register("kernel_panic", self.kernel_panic)
200-
ltp.events.register("kernel_tained", self.kernel_tained)
200+
ltp.events.register("kernel_tainted", self.kernel_tainted)
201201
ltp.events.register("test_timed_out", self.test_timed_out)
202202
ltp.events.register("test_started", self.test_started)
203203
ltp.events.register("test_completed", self.test_completed)
@@ -208,8 +208,8 @@ def sut_not_responding(self) -> None:
208208
def kernel_panic(self) -> None:
209209
self._kernel_panic = True
210210

211-
def kernel_tained(self, message: str) -> None:
212-
self._kernel_tained = message
211+
def kernel_tainted(self, message: str) -> None:
212+
self._kernel_tainted = message
213213

214214
def test_timed_out(self, _: Test, timeout: int) -> None:
215215
self._timed_out = True
@@ -242,16 +242,16 @@ def test_completed(self, results: TestResults) -> None:
242242

243243
self._print(msg, color=col, end="")
244244

245-
if self._kernel_tained:
245+
if self._kernel_tainted:
246246
self._print(" | ", end="")
247-
self._print("tained", color=self.YELLOW, end="")
247+
self._print("tainted", color=self.YELLOW, end="")
248248

249249
uf_time = self._user_friendly_duration(results.exec_time)
250250
self._print(f" ({uf_time})")
251251

252252
self._sut_not_responding = False
253253
self._kernel_panic = False
254-
self._kernel_tained = None
254+
self._kernel_tainted = None
255255
self._timed_out = False
256256

257257

@@ -266,7 +266,7 @@ def __init__(self, no_colors: bool = False) -> None:
266266
self._timed_out = False
267267

268268
ltp.events.register("sut_stdout_line", self.sut_stdout_line)
269-
ltp.events.register("kernel_tained", self.kernel_tained)
269+
ltp.events.register("kernel_tainted", self.kernel_tainted)
270270
ltp.events.register("test_timed_out", self.test_timed_out)
271271
ltp.events.register("test_started", self.test_started)
272272
ltp.events.register("test_completed", self.test_completed)
@@ -275,7 +275,7 @@ def __init__(self, no_colors: bool = False) -> None:
275275
def sut_stdout_line(self, _: str, data: str) -> None:
276276
self._print_stdout(data)
277277

278-
def kernel_tained(self, message: str) -> None:
278+
def kernel_tainted(self, message: str) -> None:
279279
self._print(f"Tained kernel: {message}", color=self.YELLOW)
280280

281281
def test_timed_out(self, _: Test, timeout: int) -> None:

0 commit comments

Comments
 (0)