Try removing redundant travis_retry.

2 files changed, 1 insertions, 24 deletions

diff --git a/tests/angularjs/scripts/install-ubuntu.sh b/tests/angularjs/scripts/install-ubuntu.sh
index 0723f5e927..a1ee0d15f3 100755
--- a/tests/angularjs/scripts/install-ubuntu.sh
+++ b/tests/angularjs/scripts/install-ubuntu.sh
@@ -1,26 +1,3 @@
-# Prevent random build failures by retrying 3 times
-# Source: https://github.com/travis-ci/travis-build/blob/fc4ae8a2ffa1f2b3a2f62533bbc4f8a9be19a8ae/lib/travis/build/script/templates/header.sh#L104
-travis_retry() {
-  local result=0
-  local count=1
-  while [ $count -le 3 ]; do
-    [ $result -ne 0 ] && {
-      echo -e "\n${RED}The command \"$@\" failed. Retrying, $count of 3.${RESET}\n" >&2
-    }
-    "$@"
-    result=$?
-    [ $result -eq 0 ] && break
-count=$(($count + 1))
-    sleep 1
-  done
-
-  [ $count -eq 3 ] && {
-    echo "\n${RED}The command \"$@\" failed 3 times.${RESET}\n" >&2
-  }
-
-  return $result
-}
-
 DIR=`dirname $0`
 cd $DIR
 travis_retry sudo apt-get -qq install python-software-properties
diff --git a/tests/travis/travis.sh b/tests/travis/travis.sh
index a9aa252b18..b3d0a7f375 100755
--- a/tests/travis/travis.sh
+++ b/tests/travis/travis.sh
@@ -30,7 +30,7 @@ then
 
     if [ "$TEST_SUITE" = "AngularJSTests" ]
     then
-        sh ./../angularjs/scripts/travis.sh
+        ./../angularjs/scripts/travis.sh
     elif [ "$TEST_SUITE" = "JavascriptTests" ]
     then
         touch ../javascript/enable_sqlite