Don't create subunit files on disk, rather just extract them out of the master file.

diff --git a/buildfarm/build.py b/buildfarm/build.py
index 4108ac0acb268d292f357084c3020ba7527fc2a1..e5993efa30ad060398ca40c2a36101e071bd2bac 100644 (file)
--- a/buildfarm/build.py
+++ b/buildfarm/build.py
@@ -329,10 +329,7 @@ class Build(object):
 
     def read_subunit(self):
         """read the test output as subunit"""
-        try:
-            return open_opt_compressed_file(self.basename+".subunit")
-        except IOError:
-            raise NoTestOutput()
+        return StringIO("".join(extract_test_output(self.read_log())))
 
     def read_log(self):
         """read full log file"""
@@ -549,16 +546,6 @@ class BuildResultStore(object):
         os.link(build.basename+".log", new_basename+".log")
         if os.path.exists(build.basename+".err"):
             os.link(build.basename+".err", new_basename+".err")
-        try:
-            subunit_output = extract_test_output(build.read_log())
-        except NoTestOutput:
-            pass
-        else:
-            f = bz2.BZ2File(new_basename+".subunit.bz2", 'w')
-            try:
-                f.writelines(subunit_output)
-            finally:
-                f.close()
         new_build = StormBuild(new_basename, build.tree, build.host,
             build.compiler, rev)
         new_build.checksum = build.log_checksum()

diff --git a/tools/fix.py b/tools/fix.py
index b02782c3eb96040034afbced335dae07ad8c0d82..272e16dd24c4ae1195c48be855d4cd07680dd918 100755 (executable)
--- a/tools/fix.py
+++ b/tools/fix.py
@@ -62,19 +62,4 @@ for build in store.find(StormBuild, StormBuild.host_id == None):
         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) or os.path.exists(subunit_path+".bz2"):
-        continue
-    try:
-        test_output = "".join(extract_test_output(build.read_log()))
-    except (LogFileMissing, NoTestOutput):
-        continue
-    print "Writing subunit file for %r" % build
-    f = bz2.BZ2File(subunit_path+".bz2", 'w')
-    try:
-        f.write(test_output)
-    finally:
-        f.close()
-
 buildfarm.commit()