Fix 2 failing tests on windows.

editor/build/build.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import glob
 import optparse
 import os
 import re
 import shutil
 import subprocess
 import sys
 import tempfile
 import gsutil
 import ziputils
 import hashlib
 
 from os.path import join
+from xml.dom.minidom import parseString
 
 BUILD_OS = None
 DART_PATH = None
 TOOLS_PATH = None
 
 GSU_PATH_REV = None
 GSU_PATH_LATEST = None
 GSU_API_DOCS_PATH = None
 GSU_API_DOCS_BUCKET = 'gs://dartlang-api-docs'
 
@@ skipping 365 matching lines @@
     if status:
       return status
 
     if not build_skip_tests:
       PrintSeparator('Running the tests')
       junit_status = ant.RunAnt('../com.google.dart.tools.tests.feature_releng',
                               'buildTests.xml',
                               revision, options.name, buildroot, buildout,
                               editorpath, buildos,
                               extra_artifacts=extra_artifacts)
+      
+      #<testsuite errors="0" failures="1" name="com.google.dart.tools.core_test"
+      #   tests="740" time="40.713">
+      testResults = parseString(open(join(buildout, 'test-results.xml')).read())
+      testsuite = testResults.documentElement
+      
+      if testsuite.getAttribute("errors") != "0":
+        junit_status = 1
+      if testsuite.getAttribute("failures") != "0":
+        junit_status = 1
+      
+      print "\n%s: %s tests, %s errors, %s failures (time: %s)\n" % (
+          testsuite.getAttribute("name"),
+          testsuite.getAttribute("tests"),
+          testsuite.getAttribute("errors"),
+          testsuite.getAttribute("failures"),
+          testsuite.getAttribute("time"))
+      
       properties = ReadPropertyFile(buildos, ant_property_file.name)
-      if buildos:
-        UploadTestHtml(buildout, to_bucket, revision, buildos, gsu)
       if junit_status:
         if properties['build.runtime']:
           #if there is a build.runtime and the status is not
           #zero see if there are any *.log entries
           PrintErrorLog(properties['build.runtime'])
     else:
       junit_status = 0
 
     if buildos:
       _InstallArtifacts(buildout, buildos, extra_artifacts)
@@ skipping 70 matching lines @@
   if os.path.exists(configdir):
     for logfile in glob.glob(os.path.join(configdir, '*.log')):
       print 'Found log file: ' + logfile
       found = True
       for logline in open(logfile):
         print logline
   if not found:
     print 'no log file was found in ' + configdir
 
 
-def UploadTestHtml(buildout, bucket, svnid, buildos, gsu):
-  """Upload the Test Results HTML to GoogleStorage.
-
-  Args:
-    buildout: the location ofthe output of the build
-    bucket: the Google Storage bucket the code is staged in
-    svnid: the revision id for this build
-    buildos: the os the build is running on
-    gsu: the gsutil object
-  """
-  print 'UploadTestHtml(%s, %s, %s, %s)' % (buildout, bucket, svnid, buildos)
-  local_dir = '{0}'.format(svnid)
-  html_dir = os.path.join(buildout, 'html')
-  cwd = os.getcwd()
-  gs_test_dir_name = 'tests'
-  tmp_dir = None
-  try:
-    if os.path.exists(html_dir):
-      tmp_dir = tempfile.mkdtemp(prefix=gs_test_dir_name)
-      local_path = os.path.join(tmp_dir, local_dir)
-      os.makedirs(local_path)
-      os.chdir(tmp_dir)
-      shutil.copytree(html_dir, os.path.join(local_path, gs_test_dir_name,
-                                             buildos))
-      gsu.Copy(svnid, bucket, recursive_flag=True)
-  finally:
-    os.chdir(cwd)
-    if tmp_dir is not None and os.path.exists(tmp_dir):
-      shutil.rmtree(tmp_dir, ignore_errors=True)
-
-
 def _FindRcpZipFiles(out_dir):
   """Find the Zipped RCP files.
 
   Args:
     out_dir: the directory the files will be located in
 
   Returns:
     a collection of rcp zip files
   """
   out_dir = os.path.normpath(os.path.normcase(out_dir))
@@ skipping 517 matching lines @@
   """delete the given file - do not re-throw any exceptions that occur"""
   if os.path.exists(f):
     try:
       os.remove(f)
     except OSError:
       print 'error deleting %s' % f
 
 
 if __name__ == '__main__':
   sys.exit(main())