From 72983744c079ab61dbc8945ffd79a1e002c5f3cf Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Fri, 16 May 2014 17:19:31 +0200
Subject: run without netstat

---
 .travis.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index dad62809f..75cfde474 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,21 +9,21 @@ env:
   - DB=mysql
 
 before_install:
-  - sudo add-apt-repository -y ppa:chris-lea/node.js
+  - sudo add-apt-repository -y ppa:chris-lea/node.js  # ubuntu 12.04 only
   - sudo apt-get update
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
 
 install:
   - cd ..
   - sudo apt-get -y install nodejs python3-jinja2 python3-setuptools apache2 chromium-browser libapache2-mod-fastcgi
-  - sudo easy_install3 pip
+  - sudo easy_install3 pip  # ubuntu 12.04 only
   - sudo pip3 install ocdev
-  - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2
-  - tar xjf phantomjs-1.9.7-linux-x86_64.tar.bz2
-  - sudo ln -s $(pwd)/phantomjs-1.9.7-linux-x86_64/bin/phantomjs /usr/bin/phantomjs
+  - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2  # ubuntu 12.04 only
+  - tar xjf phantomjs-1.9.7-linux-x86_64.tar.bz2  # ubuntu 12.04 only
+  - sudo ln -s $(pwd)/phantomjs-1.9.7-linux-x86_64/bin/phantomjs /usr/bin/phantomjs  # ubuntu 12.04 only
   - ocdev setup core --dir owncloud
   - cd news/js
-  - npm install --deps
+  - npm install --deps # npm install needs to run before sudo npm install because otherwise it fails because a tmp file exists in the home dir
   - sudo npm -g install grunt-cli protractor
   - sudo webdriver-manager update
   - cd ../../
@@ -36,7 +36,7 @@ before_script:
   - mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost'";
   - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
   - sudo a2enmod rewrite actions fastcgi alias
-  - sudo netstat -tulpn
+  #- sudo netstat -tulpn
   - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
   - sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache /etc/apache2/sites-available/default
@@ -60,5 +60,3 @@ script:
 addons:
   postgresql: "9.3"
 
-matrix:
-  fast_finish: true
-- 
cgit v1.2.3