From 0a8e94d0318712f86aed974d19a44b18c65266bb Mon Sep 17 00:00:00 2001 From: ZyX Date: Fri, 9 Jan 2015 17:40:05 +0300 Subject: [PATCH 1/2] =?UTF-8?q?When=20using=20`rc`=20remove=20=E2=80=9Crea?= =?UTF-8?q?d()=20failed=E2=80=9D=20messages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_shells/postproc.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_shells/postproc.py b/tests/test_shells/postproc.py index df8a6dad..ff9c5748 100755 --- a/tests/test_shells/postproc.py +++ b/tests/test_shells/postproc.py @@ -98,4 +98,7 @@ with codecs.open(fname, 'r', encoding='utf-8') as R: line = IPYPY_DEANSI_RE.subn('', line)[0] if line == '\n' and not was_empty: line = '' + elif shell == 'rc': + if line == 'read() failed: Connection reset by peer\n': + line = '' W.write(line) From 9511c45e6f1b95bdcf25bf0e641ab8666e21e77a Mon Sep 17 00:00:00 2001 From: ZyX Date: Fri, 9 Jan 2015 17:42:20 +0300 Subject: [PATCH 2/2] Make sure to remove logs before retrying --- tests/test_shells/test.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh index f93c79b0..81b5edb2 100755 --- a/tests/test_shells/test.sh +++ b/tests/test_shells/test.sh @@ -181,8 +181,13 @@ do_run_test() { } run_test() { + TEST_TYPE="$1" + TEST_CLIENT="$2" + SH="$3" local attempts=3 while test $attempts -gt 0 ; do + rm -f tests/shell/${SH}.${TEST_TYPE}.${TEST_CLIENT}.log + rm -f tests/shell/${SH}.${TEST_TYPE}.${TEST_CLIENT}.full.log do_run_test "$@" && return 0 attempts=$(( attempts - 1 )) done