From b496ff9bb11949a4739ba44c75f2f5504a094fdb Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Fri, 5 Feb 2021 18:02:45 +0100 Subject: Removing annoying flake8 plugins --- minishell_test/test/captured.py | 8 ++++---- minishell_test/test/result.py | 20 ++++++++++---------- minishell_test/test/test.py | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'minishell_test/test') diff --git a/minishell_test/test/captured.py b/minishell_test/test/captured.py index d24bcdf..7db9739 100644 --- a/minishell_test/test/captured.py +++ b/minishell_test/test/captured.py @@ -6,7 +6,7 @@ # By: charles +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2020/09/11 12:16:25 by charles #+# #+# # -# Updated: 2021/02/05 14:55:31 by charles ### ########.fr # +# Updated: 2021/02/05 17:47:10 by charles ### ########.fr # # # # ############################################################################ # @@ -46,9 +46,9 @@ class Captured: raise NotImplementedError if self.is_timeout: return self.is_timeout == other.is_timeout - return (self.output == other.output - and self.status == other.status - and all(x == y for x, y in zip(self.files_content, other.files_content))) + return (self.output == other.output and + self.status == other.status and + all(x == y for x, y in zip(self.files_content, other.files_content))) @staticmethod def timeout(): diff --git a/minishell_test/test/result.py b/minishell_test/test/result.py index ec0f192..9769527 100644 --- a/minishell_test/test/result.py +++ b/minishell_test/test/result.py @@ -6,7 +6,7 @@ # By: charles +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2020/09/11 12:17:34 by charles #+# #+# # -# Updated: 2021/02/05 14:55:23 by charles ### ########.fr # +# Updated: 2021/02/05 17:46:30 by charles ### ########.fr # # # # ############################################################################ # @@ -168,11 +168,11 @@ class Result(BaseResult): return "" file_header = self.indicator("FILE {}".format(file_name), "|#") + '\n' return ( - file_header - + self.expected_header - + self.cat_e(expected) - + self.actual_header - + self.cat_e(actual) + file_header + + self.expected_header + + self.cat_e(expected) + + self.actual_header + + self.cat_e(actual) ) def files_diff(self): @@ -194,10 +194,10 @@ class Result(BaseResult): .format(self.expected.status, self.actual.status), "| " ) + '\n' if self.expected.output != self.actual.output: - out += (self.expected_header - + self.cat_e(self.expected.output) - + self.actual_header - + self.cat_e(self.actual.output)) + out += (self.expected_header + + self.cat_e(self.expected.output) + + self.actual_header + + self.cat_e(self.actual.output)) return out def full_diff(self) -> str: diff --git a/minishell_test/test/test.py b/minishell_test/test/test.py index a6305b9..7b6a118 100644 --- a/minishell_test/test/test.py +++ b/minishell_test/test/test.py @@ -6,7 +6,7 @@ # By: charles +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2020/06/16 21:48:50 by charles #+# #+# # -# Updated: 2021/02/05 14:42:26 by charles ### ########.fr # +# Updated: 2021/02/05 17:39:44 by charles ### ########.fr # # # # ############################################################################ # @@ -20,7 +20,7 @@ from minishell_test.test.captured import Captured from minishell_test.test.result import Result, LeakResult import minishell_test.sandbox as sandbox -HookType = Union[Callable[[str], str], List[Callable[[str], str]]] +HookType = Union[Callable[[str], str], List[Callable[[str], str]]] HookStatusType = Union[Callable[[int], int], List[Callable[[int], int]]] -- cgit