From e1ed8a765f6f3d5f66a617a069c03d836d1df8a3 Mon Sep 17 00:00:00 2001
From: Nicolas KAROLAK <nicolas@karolak.fr>
Date: Tue, 18 Sep 2018 10:36:58 +0200
Subject: [PATCH] fix(test_fail2ban): int comparison & output
---
tests/test_fail2ban.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/tests/test_fail2ban.py b/tests/test_fail2ban.py
index 16f15db2..80436ea4 100755
--- a/tests/test_fail2ban.py
+++ b/tests/test_fail2ban.py
@@ -69,8 +69,10 @@ def get_jails() -> list:
:rtype: list
"""
- _, output = u.exec_cmd(["fail2ban-client status | grep 'Jail list'"])
- jails = output.split(":")[1].replace(" ", "").split(",")
+ _, output = u.exec_cmd(
+ "fail2ban-client status | grep 'Jail list'", log_output=False
+ )
+ jails = output.split(":")[1].strip().replace(" ", "").split(",")
return jails
@@ -85,12 +87,13 @@ def check_jail_banned(name: str) -> int:
"""
_, output = u.exec_cmd(
- "fail2ban-client status {} | grep 'Currently banned'".format(name)
+ "fail2ban-client status {} | grep 'Currently banned'".format(name),
+ log_output=False,
)
- banned = output.split(":")[1].replace(" ", "")
+ banned = output.split(":")[1].strip()
if banned:
- return banned
+ return int(banned)
return 0
--
GitLab