From 855e33274ee3ac881fdf66a68fbea6069ce2ce09 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 20 Jul 2014 02:00:56 +0400 Subject: [PATCH] =?UTF-8?q?Fix=20travis=20build:=20on=20travis=20=E2=80=9C?= =?UTF-8?q?Terminated=E2=80=A6=E2=80=9D=20message=20is=20truncated?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_shells/mksh.ok | 2 +- tests/test_shells/postproc.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/test_shells/mksh.ok b/tests/test_shells/mksh.ok index f03a4c29..09307716 100644 --- a/tests/test_shells/mksh.ok +++ b/tests/test_shells/mksh.ok @@ -7,7 +7,7 @@ [1] PID   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1 -[1] + Terminated bash -c "echo \$\$>pid ; while true ; do sleep 0.1s ; done" +[1] + Terminated bash -c ...   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  cd "$DIR1"   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^[[32m  cd ../"$DIR2"   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  ^H  cd ../'\[\]' diff --git a/tests/test_shells/postproc.py b/tests/test_shells/postproc.py index 8d85917c..ce68c9d5 100755 --- a/tests/test_shells/postproc.py +++ b/tests/test_shells/postproc.py @@ -48,4 +48,9 @@ with codecs.open(fname, 'r', encoding='utf-8') as R: line = line[start:end] + '\033[0m\n' except ValueError: line = '' + elif shell == 'mksh': + # Output is different in travis: on my machine I see full + # command, in travis it is truncated just after `true`. + if line.startswith('[1] + Terminated'): + line = '[1] + Terminated bash -c ...\n' W.write(line)