github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

minor residual cleanups

pull/1483/head
Yaroslav Halchenko 2016-07-12 00:06:41 -04:00
parent fcda7c9ac7
commit 3c42b4f56e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fail2ban/client/fail2bancmdline.py
View File

@ -270,7 +270,6 @@ class Fail2banCmdLine():
@staticmethod @staticmethod
def exit(code=0): def exit(code=0):
logSys.debug("Exit with code %s", code) logSys.debug("Exit with code %s", code)
# import pdb; pdb.set_trace()
Fail2banCmdLine._exit(code) Fail2banCmdLine._exit(code)

4
fail2ban/tests/fail2banclienttestcase.py
View File

@ -419,7 +419,7 @@ class Fail2banClientTest(Fail2banClientServerBase):
global INTERACT global INTERACT
startparams = _start_params(tmp, logtarget=pjoin(tmp, "f2b.log")) startparams = _start_params(tmp, logtarget=pjoin(tmp, "f2b.log"))
# start (in new process, using the same python version): # 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) logSys.debug('Start %s ...', cmd)
cmd = cmd + startparams + ("--async", "start",) cmd = cmd + startparams + ("--async", "start",)
ret = Utils.executeCmd(cmd, timeout=MAX_WAITTIME, shell=False, output=True) 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: # to prevent fork of test-cases process, start server in background via command:
startparams = _start_params(tmp, logtarget=pjoin(tmp, "f2b.log")) startparams = _start_params(tmp, logtarget=pjoin(tmp, "f2b.log"))
# start (in new process, using the same python version): # 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) logSys.debug('Start %s ...', cmd)
cmd = cmd + startparams + ("-b",) cmd = cmd + startparams + ("-b",)
ret = Utils.executeCmd(cmd, timeout=MAX_WAITTIME, shell=False, output=True) ret = Utils.executeCmd(cmd, timeout=MAX_WAITTIME, shell=False, output=True)