From 3c42b4f56e5e20a56e22d534371ff7adbc2ce78b Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 12 Jul 2016 00:06:41 -0400 Subject: [PATCH] minor residual cleanups --- fail2ban/client/fail2bancmdline.py | 1 - fail2ban/tests/fail2banclienttestcase.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fail2ban/client/fail2bancmdline.py b/fail2ban/client/fail2bancmdline.py index 19f596a2..aadf823a 100644 --- a/fail2ban/client/fail2bancmdline.py +++ b/fail2ban/client/fail2bancmdline.py @@ -270,7 +270,6 @@ class Fail2banCmdLine(): @staticmethod def exit(code=0): logSys.debug("Exit with code %s", code) - # import pdb; pdb.set_trace() Fail2banCmdLine._exit(code) diff --git a/fail2ban/tests/fail2banclienttestcase.py b/fail2ban/tests/fail2banclienttestcase.py index fa8a210c..24b396f5 100644 --- a/fail2ban/tests/fail2banclienttestcase.py +++ b/fail2ban/tests/fail2banclienttestcase.py @@ -419,7 +419,7 @@ class Fail2banClientTest(Fail2banClientServerBase): global INTERACT startparams = _start_params(tmp, logtarget=pjoin(tmp, "f2b.log")) # start (in new process, using the same python version): - cmd = (sys.executable, pjoin(pjoin(BIN), CLIENT)) + cmd = (sys.executable, pjoin(BIN, CLIENT)) logSys.debug('Start %s ...', cmd) cmd = cmd + startparams + ("--async", "start",) ret = Utils.executeCmd(cmd, timeout=MAX_WAITTIME, shell=False, output=True) @@ -550,7 +550,7 @@ class Fail2banServerTest(Fail2banClientServerBase): # to prevent fork of test-cases process, start server in background via command: startparams = _start_params(tmp, logtarget=pjoin(tmp, "f2b.log")) # start (in new process, using the same python version): - cmd = (sys.executable, pjoin(pjoin(BIN), SERVER)) + cmd = (sys.executable, pjoin(BIN, SERVER)) logSys.debug('Start %s ...', cmd) cmd = cmd + startparams + ("-b",) ret = Utils.executeCmd(cmd, timeout=MAX_WAITTIME, shell=False, output=True)