You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2014/11/19 18:35:54 UTC
svn commit: r1640609 -
/lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py
Author: thelabdude
Date: Wed Nov 19 17:35:54 2014
New Revision: 1640609
URL: http://svn.apache.org/r1640609
Log:
SOLR-6708: backport fix from trunk
Modified:
lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py
Modified: lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py?rev=1640609&r1=1640608&r2=1640609&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py Wed Nov 19 17:35:54 2014
@@ -859,8 +859,13 @@ def testSolrExample(unpackPath, javaPath
env.update(os.environ)
env['JAVA_HOME'] = javaPath
env['PATH'] = '%s/bin:%s' % (javaPath, env['PATH'])
+
# Stop Solr running on port 8983 (in case a previous run didn't shutdown cleanly)
- subprocess.call(['bin/solr','stop','-p','8983'])
+ try:
+ subprocess.call(['bin/solr','stop','-p','8983'])
+ except:
+ print(' Stop failed due to: '+sys.exc_info()[0])
+
print(' starting Solr on port 8983 from %s' % unpackPath)
server = subprocess.Popen(['bin/solr', '-f', '-p', '8983'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, env=env)