Merge commit 'HEAD@{1}' into develop

This commit is contained in:
ZyX 2014-10-12 00:39:00 +04:00
commit 218f72e7db
1 changed files with 1 additions and 1 deletions

View File

@ -277,7 +277,7 @@ class TestShell(TestCase):
class TestTmux(TestCase):
def test_attached_clients(self):
def get_tmux_output(cmd, *args):
def get_tmux_output(pl, cmd, *args):
if cmd == 'list-panes':
return 'session_name\n'
elif cmd == 'list-clients':