fix sporadic test-cases fails: change debug transmitter-message (sometimes confused with expected "Server ready" of server), better syntax for internal subst _use_flush;

pull/2225/head
sebres 6 years ago
parent d01fe9d22a
commit 08f3f12f10

@ -116,7 +116,7 @@ class Transmitter:
elif command[0] == "echo": elif command[0] == "echo":
return command[1:] return command[1:]
elif command[0] == "server-status": elif command[0] == "server-status":
logSys.debug("Server ready") logSys.debug("Status: ready")
return "Server ready" return "Server ready"
elif command[0] == "sleep": elif command[0] == "sleep":
value = command[1] value = command[1]

@ -805,7 +805,7 @@ class Fail2banServerTest(Fail2banClientServerBase):
"norestored = %(_exec_once)s", "norestored = %(_exec_once)s",
"restore = ", "restore = ",
"info = ", "info = ",
"_use_flush_ = echo [<name>] <actname>: -- flushing IPs", "_use_flush_ = echo '[%(name)s] %(actname)s: -- flushing IPs'",
"actionstart = echo '[%(name)s] %(actname)s: ** start'", start, "actionstart = echo '[%(name)s] %(actname)s: ** start'", start,
"actionreload = echo '[%(name)s] %(actname)s: .. reload'", reload, "actionreload = echo '[%(name)s] %(actname)s: .. reload'", reload,
"actionban = echo '[%(name)s] %(actname)s: ++ ban <ip> %(restore)s%(info)s'", ban, "actionban = echo '[%(name)s] %(actname)s: ++ ban <ip> %(restore)s%(info)s'", ban,

Loading…
Cancel
Save