From 47b9eb47ddd64d770791556f18fedceaf3a705ec Mon Sep 17 00:00:00 2001
From: Marius van den Beek <m.vandenbeek@gmail.com>
Date: Tue, 2 Feb 2016 12:57:29 +0100
Subject: [PATCH 1/3] Add tox startup test and build matrix for travis-ci.

---
 .ci/first_startup.sh |  6 ++++++
 .travis.yml          | 15 ++++++++++++++-
 tox.ini              |  4 ++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 .ci/first_startup.sh

diff --git a/.ci/first_startup.sh b/.ci/first_startup.sh
new file mode 100644
index 000000000000..8b7453bef126
--- /dev/null
+++ b/.ci/first_startup.sh
@@ -0,0 +1,6 @@
+echo "Testing for correct startup:"
+bash run.sh --daemon && sleep 30s && curl -I localhost:8080
+EXIT_CODE=$?
+echo "exit code:$EXIT_CODE, showing startup log:"
+cat paster.log
+exit $EXIT_CODE
diff --git a/.travis.yml b/.travis.yml
index b5b7dbc7ed26..87172e123ba1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,31 @@
 language: python
 python: 2.7
+os:
+  - linux
 env:
+  - TOX_ENV=first_startup
   - TOX_ENV=py34-lint
   - TOX_ENV=py27-lint
   - TOX_ENV=py26-lint
   - TOX_ENV=py27-unit
   - TOX_ENV=py26-unit
   - TOX_ENV=qunit
+matrix:
+  include:
+  - os: osx
+    env: TOX_ENV=first_startup
+    language: generic
+
+before_install:
+  - if [ `uname` == "Darwin"  ]; then bash -c "brew update && brew install python"; fi
 
 install:
   - pip install tox
   - if [ "$TOX_ENV" == "qunit" ]; then bash -c 'cd test/qunit && npm install'; fi
+  - if [ "$TOX_ENV" == "first_startup" ]; then bash -c "bash scripts/common_startup.sh && wget -q https://github.com/jmchilton/galaxy-downloads/raw/master/db_gx_rev_0127.sqlite && mv db_gx_rev_0127.sqlite database/universe.sqlite && bash manage_db.sh -c ./config/galaxy.ini.sample upgrade"; fi
 
-script: tox -e $TOX_ENV
+script: 
+  - tox -e $TOX_ENV
 
 notifications:
   email: false
diff --git a/tox.ini b/tox.ini
index 0e0676b4b191..8cd3ba786d43 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,3 +47,7 @@ whitelist_externals = bash
 [testenv:web-controller-line-count]
 commands = bash .ci/check_controller.sh
 whitelist_externals = bash
+
+[testenv:first_startup]
+commands = bash .ci/first_startup.sh
+whitelist_externals = bash

From 4176bc9115b94eba30c6ad9c7a1bf08823a3791b Mon Sep 17 00:00:00 2001
From: Marius van den Beek <m.vandenbeek@gmail.com>
Date: Tue, 2 Feb 2016 15:52:37 +0100
Subject: [PATCH 2/3] Move first_startup to last position

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 87172e123ba1..0ae9f4e03c3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,13 @@ python: 2.7
 os:
   - linux
 env:
-  - TOX_ENV=first_startup
   - TOX_ENV=py34-lint
   - TOX_ENV=py27-lint
   - TOX_ENV=py26-lint
   - TOX_ENV=py27-unit
   - TOX_ENV=py26-unit
   - TOX_ENV=qunit
+  - TOX_ENV=first_startup
 matrix:
   include:
   - os: osx

From 3d4ddc438eb8e7e8822a2b0b05820098140ad6f3 Mon Sep 17 00:00:00 2001
From: Marius van den Beek <m.vandenbeek@gmail.com>
Date: Tue, 2 Feb 2016 16:12:20 +0100
Subject: [PATCH 3/3] Add py27-unit tests on osx

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0ae9f4e03c3d..156a6bfe265f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,9 @@ matrix:
   - os: osx
     env: TOX_ENV=first_startup
     language: generic
+  - os: osx
+    env: TOX_ENV=py27-unit
+    language: generic
 
 before_install:
   - if [ `uname` == "Darwin"  ]; then bash -c "brew update && brew install python"; fi
@@ -24,8 +27,7 @@ install:
   - if [ "$TOX_ENV" == "qunit" ]; then bash -c 'cd test/qunit && npm install'; fi
   - if [ "$TOX_ENV" == "first_startup" ]; then bash -c "bash scripts/common_startup.sh && wget -q https://github.com/jmchilton/galaxy-downloads/raw/master/db_gx_rev_0127.sqlite && mv db_gx_rev_0127.sqlite database/universe.sqlite && bash manage_db.sh -c ./config/galaxy.ini.sample upgrade"; fi
 
-script: 
-  - tox -e $TOX_ENV
+script: tox -e $TOX_ENV
 
 notifications:
   email: false