svn commit: r1682508 - in /lucene/dev/branches/branch_5x: ./ dev-tools/ dev-tools/scripts/checkJavaDocs.py dev-tools/scripts/smokeTestRelease.py

[mi...@apache.org]

Author: mikemccand
Date: Fri May 29 15:52:39 2015
New Revision: 1682508

URL: http://svn.apache.org/r1682508
Log:
fix smoke tester to pass again

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/dev-tools/   (props changed)
    lucene/dev/branches/branch_5x/dev-tools/scripts/checkJavaDocs.py
    lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py

Modified: lucene/dev/branches/branch_5x/dev-tools/scripts/checkJavaDocs.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/dev-tools/scripts/checkJavaDocs.py?rev=1682508&r1=1682507&r2=1682508&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/dev-tools/scripts/checkJavaDocs.py (original)
+++ lucene/dev/branches/branch_5x/dev-tools/scripts/checkJavaDocs.py Fri May 29 15:52:39 2015
@@ -274,7 +274,7 @@ def checkSummary(fullPath):
       if lineLower.startswith('package ') or lineLower.startswith('<h1 title="package" '):
         sawPackage = True
       elif sawPackage:
-        if lineLower.startswith('<table ') or lineLower.startswith('<b>see: '):
+        if lineLower.startswith('<table ') or lineLower.startswith('<b>see: ') or lineLower.startswith('<p>see:'):
           desc = ' '.join(desc)
           desc = reMarkup.sub(' ', desc)
           desc = desc.strip()

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=1682508&r1=1682507&r2=1682508&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/branch_5x/dev-tools/scripts/smokeTestRelease.py Fri May 29 15:52:39 2015
@@ -1409,38 +1409,37 @@ def confirmAllReleasesAreTestedForBackCo
 
   os.chdir(unpackPath)
 
-  for suffix in '',:
-    print('    run TestBackwardsCompatibility%s..' % suffix)
-    command = 'ant test -Dtestcase=TestBackwardsCompatibility%s -Dtests.verbose=true' % suffix
-    p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    stdout, stderr = p.communicate()
-    if p.returncode is not 0:
-      # Not good: the test failed!
-      raise RuntimeError('%s failed:\n%s' % (command, stdout))
-    stdout = stdout.decode('utf-8')
-
-    if stderr is not None:
-      # Should not happen since we redirected stderr to stdout:
-      raise RuntimeError('stderr non-empty')
-
-    reIndexName = re.compile(r'TEST: (old index |index |\s*=\s*)(.*?)(-cfs|-nocfs)$', re.MULTILINE)
-    for skip, name, cfsPart in reIndexName.findall(stdout):
-      # Fragile: decode the inconsistent naming schemes we've used in TestBWC's indices:
-      #print('parse name %s' % name)
-      tup = tuple(name.split('.'))
-      if len(tup) == 3:
-        # ok
-        tup = tuple(int(x) for x in tup)
-      elif tup == ('4', '0', '0', '1'):
-        # CONFUSING: this is the 4.0.0-alpha index??
-        tup = 4, 0, 0, 0
-      elif tup == ('4', '0', '0', '2'):
-        # CONFUSING: this is the 4.0.0-beta index??
-        tup = 4, 0, 0, 1
-      else:
-        raise RuntimeError('could not parse version %s' % name)
+  print('    run TestBackwardsCompatibility..')
+  command = 'ant test -Dtestcase=TestBackwardsCompatibility -Dtests.verbose=true'
+  p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  stdout, stderr = p.communicate()
+  if p.returncode is not 0:
+    # Not good: the test failed!
+    raise RuntimeError('%s failed:\n%s' % (command, stdout))
+  stdout = stdout.decode('utf-8')
+
+  if stderr is not None:
+    # Should not happen since we redirected stderr to stdout:
+    raise RuntimeError('stderr non-empty')
+
+  reIndexName = re.compile(r'TEST: (old index |index |\s*=\s*)(.*?)(-cfs|-nocfs)$', re.MULTILINE)
+  for skip, name, cfsPart in reIndexName.findall(stdout):
+    # Fragile: decode the inconsistent naming schemes we've used in TestBWC's indices:
+    #print('parse name %s' % name)
+    tup = tuple(name.split('.'))
+    if len(tup) == 3:
+      # ok
+      tup = tuple(int(x) for x in tup)
+    elif tup == ('4', '0', '0', '1'):
+      # CONFUSING: this is the 4.0.0-alpha index??
+      tup = 4, 0, 0, 0
+    elif tup == ('4', '0', '0', '2'):
+      # CONFUSING: this is the 4.0.0-beta index??
+      tup = 4, 0, 0, 1
+    else:
+      raise RuntimeError('could not parse version %s' % name)
 
-      testedIndices.add(tup)
+    testedIndices.add(tup)
 
   l = list(testedIndices)
   l.sort()