diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2021-03-28 20:12:41 +0200 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2021-03-28 20:12:41 +0200 |
| commit | b014b19192b4ae64d848b25e99856eb4ba6cdd72 (patch) | |
| tree | 223ded87c5ee30a35258630f679d422f22bcb216 | |
| parent | bea824f7597f716c206f9ab2d472778aeaacad7e (diff) | |
| download | minishell_test-b014b19192b4ae64d848b25e99856eb4ba6cdd72.tar.gz minishell_test-b014b19192b4ae64d848b25e99856eb4ba6cdd72.tar.bz2 minishell_test-b014b19192b4ae64d848b25e99856eb4ba6cdd72.zip | |
Added end_command_with_linefeed configuration option1.1.3
| -rw-r--r-- | minishell_test/config.py | 33 | ||||
| -rw-r--r-- | minishell_test/data/default.cfg | 1 | ||||
| -rw-r--r-- | minishell_test/test/test.py | 4 | ||||
| -rw-r--r-- | setup.cfg | 2 |
4 files changed, 23 insertions, 17 deletions
diff --git a/minishell_test/config.py b/minishell_test/config.py index 00d147c..465be72 100644 --- a/minishell_test/config.py +++ b/minishell_test/config.py @@ -6,7 +6,7 @@ # By: cacharle <me@cacharle.xyz> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2021/02/26 09:40:36 by cacharle #+# #+# # -# Updated: 2021/02/28 11:19:13 by cacharle ### ########.fr # +# Updated: 2021/03/28 20:06:36 by cacharle ### ########.fr # # # # ############################################################################ # @@ -60,6 +60,7 @@ class Config(): shell_reference_args = cast(List[str], None) timeout_test = cast(float, None) timeout_leaks = cast(float, None) + end_command_with_linefeed = cast(bool, None) cache_dir = cast(Path, None) sandbox_dir = cast(Path, None) shell_available_commands_dir = cast(Path, None) @@ -74,6 +75,7 @@ class Config(): valgrind_cmd = cast(List[str], None) term_cols = cast(int, None) platform = cast(str, None) + platform = cast(str, None) @classmethod def init(cls, args): @@ -84,23 +86,24 @@ class Config(): cfg = cls._load_cfg() - cls.bonus = cfg.getboolean('minishell_test', 'bonus') - cls.exec_name = cfg.get('minishell_test', 'exec_name') - cls.make = cfg.getboolean('minishell_test', 'make') - cls.make_args = cfg.getargs('minishell_test', 'make_args') - cls.pager = cfg.getboolean('minishell_test', 'pager') - cls.pager_prog = cfg.get('minishell_test', 'pager_prog') - cls.log_path = cfg.getpath('minishell_test', 'log_path') - cls.check_error_messages = cfg.getboolean('minishell_test', 'check_error_messages') + cls.bonus = cfg.getboolean('minishell_test', 'bonus') + cls.exec_name = cfg.get('minishell_test', 'exec_name') + cls.make = cfg.getboolean('minishell_test', 'make') + cls.make_args = cfg.getargs('minishell_test', 'make_args') + cls.pager = cfg.getboolean('minishell_test', 'pager') + cls.pager_prog = cfg.get('minishell_test', 'pager_prog') + cls.log_path = cfg.getpath('minishell_test', 'log_path') + cls.check_error_messages = cfg.getboolean('minishell_test', 'check_error_messages') + cls.end_command_with_linefeed = cfg.getboolean('minishell_test', 'end_command_with_linefeed') - cls.shell_available_commands = cfg.getmultiline('shell', 'available_commands') - cls.shell_path_variable = cfg.get('shell', 'path_variable') + cls.shell_available_commands = cfg.getmultiline('shell', 'available_commands') + cls.shell_path_variable = cfg.get('shell', 'path_variable') - cls.shell_reference_path = cfg.getpath('shell:reference', 'path') - cls.shell_reference_args = cfg.getargs('shell:reference', 'args') + cls.shell_reference_path = cfg.getpath('shell:reference', 'path') + cls.shell_reference_args = cfg.getargs('shell:reference', 'args') - cls.timeout_test = cfg.getfloat('timeout', 'test') - cls.timeout_leaks = cfg.getfloat('timeout', 'leaks') + cls.timeout_test = cfg.getfloat('timeout', 'test') + cls.timeout_leaks = cfg.getfloat('timeout', 'leaks') xdg_cache_home = os.environ.get('XDG_CACHE_HOME') home = os.environ.get('HOME') diff --git a/minishell_test/data/default.cfg b/minishell_test/data/default.cfg index 158c7af..9344441 100644 --- a/minishell_test/data/default.cfg +++ b/minishell_test/data/default.cfg @@ -7,6 +7,7 @@ pager = false pager_prog = less log_path = minishell_test.log check_error_messages = true +end_command_with_linefeed = true [shell] available_commands = diff --git a/minishell_test/test/test.py b/minishell_test/test/test.py index f45b8b4..1f10f29 100644 --- a/minishell_test/test/test.py +++ b/minishell_test/test/test.py @@ -6,7 +6,7 @@ # By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2020/06/16 21:48:50 by charles #+# #+# # -# Updated: 2021/03/01 16:02:35 by cacharle ### ########.fr # +# Updated: 2021/03/28 20:08:57 by cacharle ### ########.fr # # # # ############################################################################ # @@ -47,6 +47,8 @@ class Test: hook_status: function to execute on status code """ self.cmd = cmd + if Config.end_command_with_linefeed: + self.cmd = self.cmd + '\n' self.setup = setup self.files = files self.exports = exports @@ -1,6 +1,6 @@ [metadata] name = minishell_test -version = 1.1.2 +version = 1.1.3 license = GPL2 license_file = LICENSE description = test for the minishell project of school 42 |