You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2013/03/31 23:30:54 UTC
svn commit: r1463058 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
dev-tools/scripts/smokeTestRelease.py
Author: mikemccand
Date: Sun Mar 31 21:30:53 2013
New Revision: 1463058
URL: http://svn.apache.org/r1463058
Log:
kill Solr example server if it hasn't started after 30 minutes
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
Modified: lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py?rev=1463058&r1=1463057&r2=1463058&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py Sun Mar 31 21:30:53 2013
@@ -805,19 +805,21 @@ def testSolrExample(unpackPath, javaPath
serverThread.setDaemon(True)
serverThread.start()
- # Make sure Solr finishes startup:
- if not startupEvent.wait(1800):
- raise RuntimeError('startup took more than 30 minutes')
- if failureEvent.isSet():
- logFile = os.path.abspath(logFile)
- print
- print('Startup failed; see log %s' % logFile)
- printFileContents(logFile)
- raise RuntimeError('failure on startup; see log %s' % logFile)
-
- print(' startup done')
-
try:
+
+ # Make sure Solr finishes startup:
+ if not startupEvent.wait(1800):
+ raise RuntimeError('startup took more than 30 minutes')
+
+ if failureEvent.isSet():
+ logFile = os.path.abspath(logFile)
+ print
+ print('Startup failed; see log %s' % logFile)
+ printFileContents(logFile)
+ raise RuntimeError('failure on startup; see log %s' % logFile)
+
+ print(' startup done')
+
print(' test utf8...')
run('sh ./exampledocs/test_utf8.sh', 'utf8.log')
print(' index example docs...')