SEARCH-247: Updating the tests, excluding the default

This commit is contained in:
Gethin James
2016-11-29 12:07:08 +01:00
parent f6bfe7d6f3
commit 6cca36d10d
2 changed files with 3 additions and 2 deletions
+2 -2
View File
@@ -22,8 +22,8 @@ docker run --rm "$dockerImage" [ -d /opt/alfresco-solr/data/alfrescoModels ] ||
docker run --rm "$dockerImage" [ -e /opt/alfresco-solr/solr.in.sh ] || (echo "solr.in.sh does not exist" && exit 1)
docker run --rm "$dockerImage" grep -q Alfresco /opt/alfresco-solr/solr.in.sh || (echo "solr.in.sh does not contain Alfresco config" && exit 1)
docker run --rm "$dockerImage" grep -q Alfresco /opt/alfresco-solr/solr.in.cmd || (echo "solr.in.cmd does not containAlfresco config" && exit 1)
docker run --rm "$dockerImage" grep -q LOGS_DIR/log4j.properties /opt/alfresco-solr/solr.in.sh || (echo "solr.in.sh does not contain SOLR_LOG_LEVEL=WARN" && exit 1)
docker run --rm "$dockerImage" grep -q LOGS_DIR!\log4j.properties /opt/alfresco-solr/solr.in.cmd || (echo "solr.in.cmd does not contain SOLR_LOG_LEVEL=WARN " && exit 1)
docker run --rm "$dockerImage" grep -q LOG4J_PROPS /opt/alfresco-solr/solr.in.sh || (echo "solr.in.sh does not contain LOG4J_PROPS" && exit 1)
docker run --rm "$dockerImage" grep -q LOG4J_PROPS /opt/alfresco-solr/solr.in.cmd || (echo "solr.in.cmd does not contain LOG4J_PROPS" && exit 1)
docker run --rm "$dockerImage" [ -e /opt/alfresco-solr/solrhome/conf/shared.properties ] || (echo "shared.properties does not exist" && exit 1)
docker run --rm "$dockerImage" /opt/alfresco-solr/solr/bin/solr start
@@ -25,6 +25,7 @@
<outputDirectory>solr</outputDirectory>
<excludes>
<exclude>**/server/solr/**</exclude>
<exclude>**/server/resources/log4j.properties</exclude>
<exclude>**/example/**</exclude>
<exclude>**/bin/solr.in.sh</exclude>
<exclude>**/bin/solr.in.cmd</exclude>