Skip to content

Commit e59514f

Browse files
committed
fix ExecResult str & pep8 false-negative
Signed-off-by: Aleksei Stepanov <penguinolog@gmail.com>
1 parent 07682d1 commit e59514f

File tree

2 files changed

+16
-32
lines changed

2 files changed

+16
-32
lines changed

exec_helpers/exec_result.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ def __str__(self) -> str:
568568
return (
569569
f"{self.__class__.__name__}(\n"
570570
f"\tcmd={self.cmd!r},\n"
571-
f"\t stdout=\n"
571+
f"\tstdout=\n"
572572
f"{self.stdout_brief!r},\n"
573573
f"\tstderr=\n"
574574
f"{self.stderr_brief!r}, \n"

test/test_exec_result.py

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,15 @@ def test_create_minimal(self, logger):
5454
self.assertEqual(result.exit_code, result["exit_code"])
5555
self.assertEqual(
5656
repr(result),
57-
"{cls}(cmd={cmd!r}, stdout={stdout}, stderr={stderr}, "
58-
"exit_code={exit_code!s},)".format(
59-
cls=exec_helpers.ExecResult.__name__, cmd=cmd, stdout=(), stderr=(), exit_code=proc_enums.INVALID
60-
),
57+
f"{exec_helpers.ExecResult.__name__}"
58+
f"(cmd={cmd!r}, stdout={()}, stderr={()}, exit_code={proc_enums.INVALID!s},)",
6159
)
6260
self.assertEqual(
6361
str(result),
64-
"{cls}(\n\tcmd={cmd!r},"
65-
"\n\t stdout=\n'{stdout_brief}',"
66-
"\n\tstderr=\n'{stderr_brief}', "
67-
"\n\texit_code={exit_code!s},\n)".format(
68-
cls=exec_helpers.ExecResult.__name__,
69-
cmd=cmd,
70-
stdout_brief="",
71-
stderr_brief="",
72-
exit_code=proc_enums.INVALID,
73-
),
62+
f"""{exec_helpers.ExecResult.__name__}(\n\tcmd={cmd!r},"""
63+
f"""\n\tstdout=\n'{""}',"""
64+
f"""\n\tstderr=\n'{""}', """
65+
f"\n\texit_code={proc_enums.INVALID!s},\n)",
7466
)
7567

7668
with self.assertRaises(IndexError):
@@ -89,10 +81,10 @@ def test_create_minimal(self, logger):
8981
def test_not_implemented(self, logger):
9082
"""Test assertion on non implemented deserializer."""
9183
result = exec_helpers.ExecResult(cmd=cmd)
92-
deserialize = getattr(result, "_ExecResult__deserialize")
84+
deserialize = getattr(result, "_ExecResult__deserialize") # noqa: B009
9385
with self.assertRaises(NotImplementedError):
9486
deserialize("tst")
95-
logger.assert_has_calls((mock.call.error("{fmt} deserialize target is not implemented".format(fmt="tst")),))
87+
logger.assert_has_calls((mock.call.error(f"{'tst'} deserialize target is not implemented"),))
9688

9789
def test_setters(self):
9890
"""Test setters: unlocked and final."""
@@ -219,21 +211,13 @@ def test_started(self):
219211
self.assertIs(result.started, started)
220212
self.assertEqual(
221213
str(result),
222-
"{cls}(\n\tcmd={cmd!r},"
223-
"\n\t stdout=\n'{stdout_brief}',"
224-
"\n\tstderr=\n'{stderr_brief}', "
225-
"\n\texit_code={exit_code!s},"
226-
"\n\tstarted={started},"
227-
"\n\tspent={spent},"
228-
"\n)".format(
229-
cls=exec_helpers.ExecResult.__name__,
230-
cmd=cmd,
231-
stdout_brief="",
232-
stderr_brief="",
233-
exit_code=proc_enums.EXPECTED,
234-
started=started.strftime("%Y-%m-%d %H:%M:%S"),
235-
spent=f"{spent // (60 * 60):02d}:{spent // 60:02d}:{spent % 60:02d}",
236-
),
214+
f"""{exec_helpers.ExecResult.__name__}(\n\tcmd={cmd!r},"""
215+
f"""\n\tstdout=\n'{""}',"""
216+
f"""\n\tstderr=\n'{""}', """
217+
f"""\n\texit_code={proc_enums.EXPECTED!s},"""
218+
f"""\n\tstarted={started.strftime("%Y-%m-%d %H:%M:%S")},"""
219+
f"\n\tspent={spent // (60 * 60):02d}:{spent // 60:02d}:{spent % 60:02d},"
220+
"\n)",
237221
)
238222

239223
def test_indexed_lines_access(self):

0 commit comments

Comments
 (0)