diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/captured.py | 13 | ||||
| -rw-r--r-- | src/test/test.py | 8 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/test/captured.py b/src/test/captured.py index 2c33b78..4cf9184 100644 --- a/src/test/captured.py +++ b/src/test/captured.py @@ -6,17 +6,23 @@ # By: charles <me@cacharle.xyz> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2020/09/11 12:16:25 by charles #+# #+# # -# Updated: 2021/01/31 03:29:22 by charles ### ########.fr # +# Updated: 2021/01/31 04:23:03 by charles ### ########.fr # # # # ############################################################################ # -from typing import List +from typing import List, Optional import config class Captured: - def __init__(self, output: str, status: int, files_content: List[str], is_timeout: bool = False): + def __init__( + self, + output: str, + status: int, + files_content: List[Optional[str]], + is_timeout: bool = False + ): """Captured class output: captured content status: command status @@ -29,7 +35,6 @@ class Captured: lines[i] = l.replace(config.REFERENCE_ERROR_BEGIN, config.MINISHELL_ERROR_BEGIN, 1) elif l.find(config.REFERENCE_PATH + ": ") == 0: lines[i] = l.replace(config.REFERENCE_PATH + ": ", config.MINISHELL_ERROR_BEGIN, 1) - self.output = '\n'.join(lines) self.status = status diff --git a/src/test/test.py b/src/test/test.py index 6f3aad5..1f8fa82 100644 --- a/src/test/test.py +++ b/src/test/test.py @@ -6,14 +6,14 @@ # By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2020/06/16 21:48:50 by charles #+# #+# # -# Updated: 2021/01/31 03:55:43 by charles ### ########.fr # +# Updated: 2021/01/31 04:41:43 by charles ### ########.fr # # # # ############################################################################ # import os import sys import subprocess -from typing import Optional, List, Dict +from typing import Optional, List, Dict, Union import config from test.captured import Captured @@ -45,7 +45,7 @@ class Test: self.setup = setup self.files = files self.exports = exports - self.result: Optional[Result] = None + self.result: Optional[Union[Result, LeakResult]] = None self.timeout = timeout self.signal = signal self.hook = hook @@ -129,7 +129,7 @@ class Test: output = "UNICODE ERROR: {}".format(process.stdout) # capture watched files content - files_content = [] + files_content: List[Optional[str]] = [] for file_name in self.files: try: with open(os.path.join(config.SANDBOX_PATH, file_name), "rb") as f: |