Support extracting subunit files.

diff --git a/buildfarm/build.py b/buildfarm/build.py
index a2ea904c74ac459e2e6f8a8c91616138fc24b620..9e4b8a6a8c1a5cba670bdc25045010d9f162b5ce 100644 (file)
--- a/buildfarm/build.py
+++ b/buildfarm/build.py
@@ -160,13 +160,13 @@ def extract_phase_output(f):
     output = None
     re_action = re.compile("^ACTION (PASSED|FAILED):\s+(.*)$")
     for l in f:
-        if l.startwith("Running action "):
+        if l.startswith("Running action "):
             name = l[len("Running action "):].strip()
             output = []
             continue
         m = re_action.match(l)
         if m:
-            assert name == m.group(1)
+            assert name == m.group(2).strip(), "%r != %r" % (name, m.group(2))
             yield name, output
             name = None
             output = []
@@ -178,7 +178,7 @@ def extract_test_output(f):
     for name, output in extract_phase_output(f):
         if name == "test":
             return output
-    return None
+    raise NoTestOutput()
 
 
 def build_status_from_logs(log, err):
@@ -268,6 +268,10 @@ class NoSuchBuildError(Exception):
         self.rev = rev
 
 
+class NoTestOutput(Exception):
+    """The build did not have any associated test output."""
+
+
 class Build(object):
     """A single build of a tree on a particular host using a particular compiler.
     """

diff --git a/buildfarm/tests/test_build.py b/buildfarm/tests/test_build.py
index 4c2d0f0007ad2ec9b60b98de50d32dbde0c664f7..b3c7a4531c256709eb4057bb82504e2e01d9acb3 100755 (executable)
--- a/buildfarm/tests/test_build.py
+++ b/buildfarm/tests/test_build.py
@@ -18,15 +18,15 @@
 from cStringIO import StringIO
 import os
 import testtools
-import unittest
 
 from buildfarm.build import (
     Build,
-    BuildResultStore,
     BuildStatus,
     NoSuchBuildError,
+    NoTestOutput,
     UploadBuildResultStore,
     build_status_from_logs,
+    extract_test_output,
     )
 
 from buildfarm import BuildFarm
@@ -402,3 +402,24 @@ class UploadBuildResultStoreTests(UploadBuildResultStoreTestBase,BuildFarmTestCa
 
         self.x = UploadBuildResultStore(
             os.path.join(self.path, "data", "upload"))
+
+
+class ExtractSubunitTests(testtools.TestCase):
+
+    def extract_test_output(self, log):
+        try:
+            return "".join(extract_test_output(StringIO(log)))
+        except NoTestOutput:
+            return None
+
+    def test_not_present(self):
+        self.assertEquals(None, self.extract_test_output(""))
+
+    def test_simple(self):
+        self.assertEquals("FOO\n", self.extract_test_output("""
+
+Running action test
+FOO
+ACTION PASSED: test
+
+"""))

diff --git a/tools/fix.py b/tools/fix.py
index 9cec88f9704b27403f4f2f35a882471fbb62c218..b4cc1725ff3071530a357ceaa744147d12472248 100755 (executable)
--- a/tools/fix.py
+++ b/tools/fix.py
@@ -8,11 +8,13 @@ from buildfarm.build import (
     build_status_from_logs,
     LogFileMissing,
     MissingRevisionInfo,
+    NoTestOutput,
     revision_from_log,
+    extract_test_output,
     )
 from buildfarm.hostdb import NoSuchHost
 
-from buildfarm.sqldb import BuildFarm, StormBuild
+from buildfarm import BuildFarm, StormBuild
 
 buildfarm = BuildFarm()
 
@@ -58,4 +60,19 @@ for build in store.find(StormBuild, StormBuild.host_id == None):
     except NoSuchHost, e:
         print "Unable to find host %s" % e.name
 
+
+for build in store.find(StormBuild, StormBuild.basename != None):
+    subunit_path = build.basename + ".subunit"
+    if os.path.exists(subunit_path):
+        continue
+    try:
+        test_output = "".join(extract_test_output(build.read_log()))
+    except (LogFileMissing, NoTestOutput):
+        continue
+    f = open(subunit_path, 'w')
+    try:
+        f.write(test_output)
+    finally:
+        f.close()
+
 buildfarm.commit()