Code review comment for lp:~le-chi-thu/lava-dispatcher/log_send_and_expect

65 + if (kw.has_key('timeout')):
66 + timeout = kw['timeout']
67 + else:
68 + timeout = self.proc.timeout
69 +
70 + if len(args) == 1:
71 + logging.debug("expect (%d): '%s'" %(timeout, args[0]))
72 + else:
73 + logging.debug("expect (%d): '%s'" %(timeout, str(args)))

We should combine these two blocks, no need to have this ambiguous check for len(args) == 1 if we just checked whether timeout was specified.

Also, there is a small merge conflict to fix. Otherwise, still looks fine.