aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2020-09-11 20:18:37 +0200
committerCharles Cabergs <me@cacharle.xyz>2020-09-11 20:18:37 +0200
commit2ffd95c295b117053f6e5430ba3ccc72beb224aa (patch)
treefd61d882314bb09f0250ee55caeedd1101938bca /src/test
parent43be3d890eb37bef2f336bbc64e362a06bebe8ac (diff)
downloadminishell_test-2ffd95c295b117053f6e5430ba3ccc72beb224aa.tar.gz
minishell_test-2ffd95c295b117053f6e5430ba3ccc72beb224aa.tar.bz2
minishell_test-2ffd95c295b117053f6e5430ba3ccc72beb224aa.zip
Linting with flake8
Diffstat (limited to 'src/test')
-rw-r--r--src/test/__init__.py4
-rw-r--r--src/test/captured.py13
-rw-r--r--src/test/result.py22
-rw-r--r--src/test/test.py12
4 files changed, 28 insertions, 23 deletions
diff --git a/src/test/__init__.py b/src/test/__init__.py
index 7601878..cf9949f 100644
--- a/src/test/__init__.py
+++ b/src/test/__init__.py
@@ -6,8 +6,8 @@
# By: charles <me@cacharle.xyz> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2020/09/11 12:18:14 by charles #+# #+# #
-# Updated: 2020/09/11 12:26:30 by charles ### ########.fr #
+# Updated: 2020/09/11 20:18:10 by charles ### ########.fr #
# #
# ############################################################################ #
-from test.test import Test
+from test.test import Test # noqa: F401
diff --git a/src/test/captured.py b/src/test/captured.py
index e47590b..b42352e 100644
--- a/src/test/captured.py
+++ b/src/test/captured.py
@@ -6,12 +6,13 @@
# By: charles <me@cacharle.xyz> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2020/09/11 12:16:25 by charles #+# #+# #
-# Updated: 2020/09/11 12:16:51 by charles ### ########.fr #
+# Updated: 2020/09/11 20:08:00 by charles ### ########.fr #
# #
# ############################################################################ #
import config
+
class Captured:
def __init__(self, output: str, status: int, files_content: [str], is_timeout: bool = False):
lines = output.split('\n')
@@ -27,13 +28,13 @@ class Captured:
self.files_content = files_content
self.is_timeout = is_timeout
- def __eq__(self, other: 'Result') -> bool:
+ def __eq__(self, other: 'Captured') -> bool:
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():
- return Captured("", 0, [], is_timeout = True)
+ return Captured("", 0, [], is_timeout=True)
diff --git a/src/test/result.py b/src/test/result.py
index 5e1349d..4f46e52 100644
--- a/src/test/result.py
+++ b/src/test/result.py
@@ -6,13 +6,16 @@
# By: charles <me@cacharle.xyz> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2020/09/11 12:17:34 by charles #+# #+# #
-# Updated: 2020/09/11 12:24:57 by charles ### ########.fr #
+# Updated: 2020/09/11 20:06:31 by charles ### ########.fr #
# #
# ############################################################################ #
+import sys
+
import config
from test.captured import Captured
+
class Result:
RED_CHARS = "\033[31m"
GREEN_CHARS = "\033[32m"
@@ -125,8 +128,10 @@ class Result:
if self.actual.is_timeout:
return "TIMEOUT\n"
if self.expected.status != self.actual.status:
- out += self.indicator("STATUS: expected {} actual {}"
- .format(self.expected.status, self.actual.status), "| ") + '\n'
+ out += self.indicator(
+ "STATUS: expected {} actual {}"
+ .format(self.expected.status, self.actual.status), "| "
+ ) + '\n'
if self.expected.output != self.actual.output:
out += (self.expected_header + '\n'
+ self.cat_e(self.expected.output)
@@ -151,9 +156,8 @@ class Result:
@property
def escaped_cmd(self):
return (self.cmd
- .replace("\t", "\\t")
- .replace("\n", "\\n")
- .replace("\v", "\\v")
- .replace("\r", "\\r")
- .replace("\f", "\\f")
- )
+ .replace("\t", "\\t")
+ .replace("\n", "\\n")
+ .replace("\v", "\\v")
+ .replace("\r", "\\r")
+ .replace("\f", "\\f"))
diff --git a/src/test/test.py b/src/test/test.py
index 04ee354..48f05a0 100644
--- a/src/test/test.py
+++ b/src/test/test.py
@@ -6,7 +6,7 @@
# By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2020/06/16 21:48:50 by charles #+# #+# #
-# Updated: 2020/09/11 17:00:25 by charles ### ########.fr #
+# Updated: 2020/09/11 20:00:52 by charles ### ########.fr #
# #
# ############################################################################ #
@@ -28,8 +28,8 @@ class Test:
files: [str] = [],
exports: {str: str} = {},
timeout: float = config.TIMEOUT,
- signal = None,
- hook = None):
+ signal=None,
+ hook=None):
self.cmd = cmd
self.setup = setup
self.files = files
@@ -47,7 +47,7 @@ class Test:
s = "[SETUP {}] {}".format(self.setup, s)
if len(self.exports) != 0:
s = "[EXPORTS {}] {}".format(
- ' '.join(["{}='{:.20}'".format(k, v) for k, v in self.exports.items()]), s)
+ ' '.join(["{}='{:.20}'".format(k, v) for k, v in self.exports.items()]), s)
self.result = Result(s, self.files, expected, actual)
self.result.put()
@@ -61,7 +61,7 @@ class Test:
sandbox.create()
if self.setup != "":
try:
- setup_status = subprocess.run(
+ subprocess.run(
self.setup,
shell=True,
cwd=config.SANDBOX_PATH,
@@ -108,7 +108,7 @@ class Test:
try:
with open(os.path.join(config.SANDBOX_PATH, file_name), "rb") as f:
files_content.append(f.read().decode())
- except FileNotFoundError as e:
+ except FileNotFoundError:
files_content.append(None)
sandbox.remove()
if self.hook is not None: