aboutsummaryrefslogtreecommitdiff
path: root/minishell_test/test/test.py
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2021-03-01 16:03:21 +0100
committerCharles Cabergs <me@cacharle.xyz>2021-03-01 16:03:47 +0100
commit6848c33412a4f57ae4de6a05d27a5b767ce89fe1 (patch)
treec8767ffe381ae5c09a273e7fec7d6192ae8d6827 /minishell_test/test/test.py
parente57cde648e801c949ea342ca4ff372fa9d2ad25c (diff)
downloadminishell_test-1.1.1.tar.gz
minishell_test-1.1.1.tar.bz2
minishell_test-1.1.1.zip
Fixing false positive everywhere bug1.1.1
Diffstat (limited to 'minishell_test/test/test.py')
-rw-r--r--minishell_test/test/test.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/minishell_test/test/test.py b/minishell_test/test/test.py
index e502588..f45b8b4 100644
--- a/minishell_test/test/test.py
+++ b/minishell_test/test/test.py
@@ -6,11 +6,12 @@
# By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2020/06/16 21:48:50 by charles #+# #+# #
-# Updated: 2021/02/28 10:42:37 by cacharle ### ########.fr #
+# Updated: 2021/03/01 16:02:35 by cacharle ### ########.fr #
# #
# ############################################################################ #
import os
+import re
import sys
import subprocess
from pathlib import Path
@@ -50,7 +51,7 @@ class Test:
self.files = files
self.exports = exports
self.result: Optional[Union[Result, LeakResult]] = None
- self.timeout = timeout if timeout < 0 else Config.timeout_test
+ self.timeout = timeout if timeout > 0 else Config.timeout_test
if not isinstance(hook, list):
hook = [hook]
if not isinstance(hook_status, list):
@@ -140,6 +141,15 @@ class Test:
output = hook(output)
for hook_status in self.hook_status:
process.returncode = hook_status(process.returncode)
+
+ # replace reference prefix with minishell prefix
+ lines = output.split('\n')
+ for i, line in enumerate(lines):
+ lines[i] = line = re.sub("line [01]: ", "", lines[i], 1)
+ if line.startswith(Config.shell_reference_prefix):
+ lines[i] = Config.minishell_prefix + line[len(Config.shell_reference_prefix):]
+ output = '\n'.join(lines)
+
return Captured(output, process.returncode, files_content)
@property