Merge branch 'travis-solr-fixes'

.travis.yml

@@ -1,11 +1,11 @@
 language: python
 python:
-    - "2.6"
     - "2.7"
 env:
-    - PGVERSION=9.1 CKANVERSION=master
-    - PGVERSION=9.1 CKANVERSION=2.3
-    - PGVERSION=9.1 CKANVERSION=2.4.0
+    - PGVERSION=9.1 CKAN_BRANCH=master
+    - PGVERSION=9.1 CKAN_BRANCH=release-v2.3-latest
+    - PGVERSION=9.1 CKAN_BRANCH=release-v2.4-latest
+    - PGVERSION=9.1 CKAN_BRANCH=release-v2.5-latest
 install:
     - bash bin/travis-build.bash
     - pip install coveralls -U

bin/travis-build.bash

@@ -10,15 +10,7 @@ sudo apt-get install postgresql-$PGVERSION solr-jetty libcommons-fileupload-java
 echo "Installing CKAN and its Python dependencies..."
 git clone https://github.com/ckan/ckan
 cd ckan
-if [ $CKANVERSION == '2.3' ]
-then
-    git checkout release-v2.3
-elif [ $CKANVERSION == '2.4.0' ]
-then
-    git checkout release-v2.4.0
-else
-    git checkout master
-fi
+git checkout $CKAN_BRANCH
 python setup.py develop
 pip install -r requirements.txt --allow-all-external
 pip install -r dev-requirements.txt --allow-all-external
@@ -39,6 +31,6 @@ pip install -r dev-requirements.txt
 
 echo "Moving test.ini into a subdir..."
 mkdir subdir
-mv test.ini subdir
+mv test-travis.ini subdir
 
 echo "travis-build.bash is done."

bin/travis-run.sh

@@ -3,4 +3,4 @@
 echo "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty
 sudo cp ckan/ckan/config/solr/schema.xml /etc/solr/conf/schema.xml
 sudo service jetty restart
-nosetests --ckan --nologcapture --with-pylons=subdir/test.ini --with-coverage --cover-package=ckanext.showcase --cover-inclusive --cover-erase --cover-tests
+nosetests --ckan --nologcapture --with-pylons=subdir/test-travis.ini --with-coverage --cover-package=ckanext.showcase --cover-inclusive --cover-erase --cover-tests

test-travis.ini

@@ -0,0 +1,20 @@
+[DEFAULT]
+debug = false
+smtp_server = localhost
+error_email_from = paste@localhost
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 5000
+
+[app:main]
+use = config:../ckan/test-core.ini
+
+# Insert any custom config settings to be used when running your extension's
+# tests here.
+
+ckan.legacy_templates = false
+ckan.plugins = showcase
+
+solr_url = http://127.0.0.1:8983/solr

test.ini

@@ -17,6 +17,8 @@ use = config:../ckan/test-core.ini
 ckan.legacy_templates = false
 ckan.plugins = showcase
 
+solr_url = http://127.0.0.1:8983/solr/ckan
+
 # Logging configuration
 [loggers]
 keys = root, ckan, sqlalchemy