summaryrefslogtreecommitdiff
path: root/testsuite/driver/testutil.py
diff options
context:
space:
mode:
authorCheng Shao <terrorjack@type.dance>2023-03-30 03:29:35 +0000
committerCheng Shao <terrorjack@type.dance>2023-03-30 18:43:53 +0000
commit8fe8b65390bdbd6b51af42a227300c46cca89b3b (patch)
tree0f9ef2443ea1f0f30eb7ae6965854f5294915be4 /testsuite/driver/testutil.py
parentf7478d9543293cd78ce81c1aa730cc3025cffe9e (diff)
downloadhaskell-8fe8b65390bdbd6b51af42a227300c46cca89b3b.tar.gz
testsuite: mypy typing error fixes
This patch fixes some mypy typing errors which weren't caught in previous linting jobs.
Diffstat (limited to 'testsuite/driver/testutil.py')
-rw-r--r--testsuite/driver/testutil.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/driver/testutil.py b/testsuite/driver/testutil.py
index f2c63c5a2d..220c1f7554 100644
--- a/testsuite/driver/testutil.py
+++ b/testsuite/driver/testutil.py
@@ -29,9 +29,9 @@ def passed(hc_opts=None) -> PassFail:
hc_opts=hc_opts)
def failBecause(reason: str,
- tag: str=None,
- stderr: str=None,
- stdout: str=None
+ tag: Optional[str]=None,
+ stderr: Optional[str]=None,
+ stdout: Optional[str]=None
) -> PassFail:
return PassFail(passed=False, reason=reason, tag=tag,
stderr=stderr, stdout=stdout, hc_opts=None)
@@ -57,7 +57,7 @@ def getStdout(cmd_and_args: List[str]):
if r != 0:
raise Exception("Command failed: " + str(cmd_and_args))
if stderr:
- raise Exception("stderr from command: %s\nStdOut(%s):\n%s\n%s\nOutput(%s):\n%s\n%s\n" % (cmd_and_args,str(len(stdout)), stdout, stdout.decode('utf-8'), str(len(stderr)), stderr, stderr.decode('utf-8')))
+ raise Exception("stderr from command: %s\nStdOut(%s):\n%r\n%s\nOutput(%s):\n%r\n%s\n" % (cmd_and_args,str(len(stdout)), stdout, stdout.decode('utf-8'), str(len(stderr)), stderr, stderr.decode('utf-8')))
return stdout.decode('utf-8')
def lndir(srcdir: Path, dstdir: Path, force_copy=False):