Tests: upgrade Solr to 4.10.4

* Resync test Solar script with django-haystack
  These are still not quite the same; at some point it would be nice to
  look into a common tool which both projects could use
* Update Solr configuration script to set correct libpath for solr-cell
  to avoid lazy-load failures during testing as was reported on e.g. django-haystack#162

Author: acdha

README.rst

@@ -114,7 +114,7 @@ Running a test Solr instance
 
 Downloading, configuring and running Solr 4 looks like this::
 
-    ./start-test-solr.sh
+    ./start-solr-test-server.sh
 
 Running the tests
 ~~~~~~~~~~~~~~~~~

run-tests.py

@@ -10,7 +10,7 @@
 
 
 def start_solr():
-    solr_proc = subprocess.Popen("./start-test-solr.sh",
+    solr_proc = subprocess.Popen("./start-solr-test-server.sh",
                                  stdout=open("test-solr.stdout.log", "wb"),
                                  stderr=open("test-solr.stderr.log", "wb"))
 

start-test-solr.sh renamed to start-solr-test-server.sh

@@ -1,8 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
-SOLR_VERSION=4.7.2
+SOLR_VERSION=4.10.4
+
+cd $(dirname $0)
+
+export TEST_ROOT=$(pwd)
 
 export SOLR_ARCHIVE="${SOLR_VERSION}.tgz"
 
@@ -16,17 +20,22 @@ if [ -f ${SOLR_ARCHIVE} ]; then
 fi
 
 if [ ! -f ${SOLR_ARCHIVE} ]; then
-    python get-solr-download-url.py $SOLR_VERSION | xargs curl -Lo $SOLR_ARCHIVE
+    SOLR_DOWNLOAD_URL=$(python get-solr-download-url.py $SOLR_VERSION)
+    curl -Lo $SOLR_ARCHIVE ${SOLR_DOWNLOAD_URL} || (echo "Unable to download ${SOLR_DOWNLOAD_URL}"; exit 2)
 fi
 
-echo "Extracting Solr ${SOLR_VERSION} to solr4/"
+echo "Extracting Solr ${SOLR_VERSION} to `pwd`/solr4/"
 rm -rf solr4
 mkdir solr4
 tar -C solr4 -xf ${SOLR_ARCHIVE} --strip-components 2 solr-${SOLR_VERSION}/example
 tar -C solr4 -xf ${SOLR_ARCHIVE} --strip-components 1 solr-${SOLR_VERSION}/dist solr-${SOLR_VERSION}/contrib
 
-echo "Configuring Solr"
+echo "Changing into solr4"
+
 cd solr4
+
+echo "Configuring Solr"
+
 rm -rf example-DIH exampledocs
 mv solr solrsinglecoreanduseless
 mv multicore solr
@@ -41,6 +50,12 @@ perl -p -i -e 's|<lib dir="../../../dist/|<lib dir="../../dist/|'g solr/*/conf/s
 perl -p -i -e 's|<!-- A Robust Example|<!-- More like this request handler -->\n  <requestHandler name="/mlt" class="solr.MoreLikeThisHandler" />\n\n\n  <!-- A Robust Example|'g solr/*/conf/solrconfig.xml
 
 echo 'Starting server'
-# We use exec to allow process monitors like run-tests.py to correctly kill the
+# We use exec to allow process monitors to correctly kill the
 # actual Java process rather than this launcher script:
-exec java -Djava.awt.headless=true -Dapple.awt.UIElement=true -jar start.jar
+export CMD="java -Djetty.port=8983 -Djava.awt.headless=true -Dapple.awt.UIElement=true -Dsolr.install.dir=`pwd` -jar start.jar"
+
+if [ -z "${BACKGROUND_SOLR}" ]; then
+    exec $CMD
+else
+    exec $CMD >/dev/null &
+fi