Permalink
Browse files

Enable tests again after Travis CI issues.

  • Loading branch information...
1 parent 9866ac0 commit 217a66de56a7fe4481fa7b52ee9e618b1a5ee3c1 @andreasrosdal andreasrosdal committed Dec 3, 2016
Showing with 17 additions and 18 deletions.
  1. +0 −1 .travis.yml
  2. +17 −17 scripts/travis-build.sh
View
@@ -11,7 +11,6 @@ python:
script: "sudo bash ./scripts/travis-build.sh"
before_install:
- - sudo mysql -u root -e "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('')"
- sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1
- sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1
- ip addr # for confirmation. can be skipped
@@ -116,30 +116,30 @@ cd ${basedir}/scripts/ && sudo -u travis ./start-freeciv-web.sh
cat ${basedir}/logs/*.log
-#echo "============================================"
-#echo "Installing CasperJS for testing"
-#cd ${basedir}/tests
+echo "============================================"
+echo "Installing CasperJS for testing"
+cd ${basedir}/tests
-#wget --quiet ${casperjs_url}
-#unzip -qo 1.1.3
-#cd casperjs-casperjs-cd78443
-#ln -sf `pwd`/bin/casperjs /usr/local/bin/casperjs
+wget --quiet ${casperjs_url}
+unzip -qo 1.1.3
+cd casperjs-casperjs-cd78443
+ln -sf `pwd`/bin/casperjs /usr/local/bin/casperjs
-#sleep 10
+sleep 10
-#echo "Start testing of Freeciv-web using CasperJS:"
-#cd ${basedir}/tests/
-#xvfb-run casperjs --engine=phantomjs test freeciv-web-tests.js || (>&2 echo "Freeciv-web CasperJS tests failed!" && exit 1)
+echo "Start testing of Freeciv-web using CasperJS:"
+cd ${basedir}/tests/
+xvfb-run casperjs --engine=phantomjs test freeciv-web-tests.js || (>&2 echo "Freeciv-web CasperJS tests failed!" && exit 1)
-#echo "Running Freeciv-web server in autogame mode."
-#cp ${basedir}/publite2/pubscript_autogame.serv ${basedir}/publite2/pubscript_singleplayer.serv
-#killall freeciv-web
+echo "Running Freeciv-web server in autogame mode."
+cp ${basedir}/publite2/pubscript_autogame.serv ${basedir}/publite2/pubscript_singleplayer.serv
+killall freeciv-web
#sleep 20
#xvfb-run casperjs --engine=phantomjs test freeciv-web-autogame.js || (>&2 echo "Freeciv-web CasperJS autogame tests failed!" && exit 1)
-#echo "running pbem unit tests."
-#cd ${basedir}/pbem
-#python3.5 test_pbem.py
+echo "running pbem unit tests."
+cd ${basedir}/pbem
+python3.5 test_pbem.py
#echo "=============================="
echo "Freeciv-web built, tested and started correctly: Build successful!"

0 comments on commit 217a66d

Please sign in to comment.