From 0fc01e07bed0a6159e551ff606b5051add8c1445 Mon Sep 17 00:00:00 2001
From: Foo <kp-pav@yandex.ru>
Date: Sat, 9 Jul 2016 16:52:54 +0300
Subject: [PATCH] Allow ipython tests to fail

---
 tests/common.sh           | 11 +++++++++--
 tests/test_shells/test.sh | 18 +++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/tests/common.sh b/tests/common.sh
index 14da0e19..eb3bbab7 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -24,12 +24,19 @@ exit_suite() {
 }
 
 fail() {
+	local allow_failure=
+	if test "x$1" = "x--allow-failure" ; then
+		shift
+		allow_failure=A
+	fi
 	local test_name="$1"
-	local fail_char="$2"
+	local fail_char="$allow_failure$2"
 	local message="$3"
 	local full_msg="$fail_char $POWERLINE_CURRENT_SUITE|$test_name :: $message"
 	FAIL_SUMMARY="${FAIL_SUMMARY}${NL}${full_msg}"
 	echo "Failed: $full_msg"
 	echo "$full_msg" >> tests/failures
-	FAILED=1
+	if test "x$allow_failure" = "x" ; then
+		FAILED=1
+	fi
 }
diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh
index f969c929..40ab938a 100755
--- a/tests/test_shells/test.sh
+++ b/tests/test_shells/test.sh
@@ -367,13 +367,6 @@ if test -z "${ONLY_SHELL}" || test "x${ONLY_SHELL%sh}" != "x${ONLY_SHELL}" || te
 					fi
 				fi
 				SH="${TEST_COMMAND%% *}"
-				# dash tests are not stable, see #931
-				if test x$FAST$SH = x1dash ; then
-					continue
-				fi
-				if test x$FAST$SH = x1fish ; then
-					continue
-				fi
 				if test "x$ONLY_SHELL" != "x" && test "x$ONLY_SHELL" != "x$SH" ; then
 					continue
 				fi
@@ -382,7 +375,13 @@ if test -z "${ONLY_SHELL}" || test "x${ONLY_SHELL%sh}" != "x${ONLY_SHELL}" || te
 				fi
 				echo ">>> $(readlink "tests/shell/path/$SH")"
 				if ! run_test $TEST_TYPE $TEST_CLIENT $TEST_COMMAND ; then
-					fail "$SH-$TEST_TYPE-$TEST_CLIENT:test" F "Failed checking $TEST_COMMAND"
+					ALLOW_FAILURE_ARG=
+					# dash tests are not stable, see #931
+					# also do not allow fish tests to spoil the build
+					if test x$FAST$SH = x1dash || test x$FAST$SH = x1fish ; then
+						ALLOW_FAILURE_ARG="--allow-failure"
+					fi
+					fail $ALLOW_FAILURE_ARG "$SH-$TEST_TYPE-$TEST_CLIENT:test" F "Failed checking $TEST_COMMAND"
 				fi
 			done
 		done
@@ -452,7 +451,8 @@ if test "x${ONLY_SHELL}" = "x" || test "x${ONLY_SHELL}" = "xipython" ; then
 		export POWERLINE_THEME_OVERRIDES='in.segments.left=[]'
 		echo "> ipython"
 		if ! run_test ipython ipython ${IPYTHON_PYTHON} -mIPython ; then
-			fail "ipython:test" F "Failed checking ${IPYTHON_PYTHON} -mIPython"
+			# Do not allow ipython tests to spoil the build
+			fail --allow-failure "ipython:test" F "Failed checking ${IPYTHON_PYTHON} -mIPython"
 		fi
 		unset POWERLINE_THEME_OVERRIDES
 		unset POWERLINE_CONFIG_OVERRIDES