Use a utils.TempDir() decorator for temporary files, to make sure we clean up even in case of excep…

tools/bots/editor.py

 #!/usr/bin/python
 # Copyright (c) 2013, 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 os
 import re
-import shutil
 import sys
-import tempfile
 
 import bot
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(os.path.join(SCRIPT_DIR, '..'))
 import utils
 
 
 GSUTIL = utils.GetBuildbotGSUtilPath()
 GCS_DARTIUM_BUCKET = "gs://dartium-archive/continuous"
 GCS_EDITOR_BUCKET = "gs://continuous-editor-archive"
 
-class TempDir(object):
-  def __enter__(self):
-    self._temp_dir = tempfile.mkdtemp('eclipse-workspace')
-    return self._temp_dir
-
-  def __exit__(self, *_):
-    shutil.rmtree(self._temp_dir, ignore_errors = True)
-
 def GetBuildDirectory(mode, arch):
   configuration_dir = mode + arch.upper()
   build_directory_dict = {
     'linux2' : os.path.join('out', configuration_dir),
     'darwin' : os.path.join('xcodebuild', configuration_dir),
     'win32' : os.path.join('build', configuration_dir),
   }
   if sys.platform == 'darwin':
     # TODO(kustermann,ricow): Maybe we're able to get rid of this in the future.
     # We use ninja on bots which use out/ (i.e. what linux2 does) instead of
@@ skipping 48 matching lines @@
   RunProcess([GSUTIL, 'setacl', 'public-read', uri])
 
 def CreateAndUploadMacInstaller(arch):
   dart_icns = os.path.join(
     'editor', 'tools', 'plugins', 'com.google.dart.tools.deploy',
     'icons', 'dart.icns')
   mac_build_bundle_py = os.path.join('tools', 'mac_build_editor_bundle.sh')
   mac_build_dmg_py = os.path.join('tools', 'mac_build_editor_dmg.sh')
   editor_dir = GetEditorDirectory('Release', arch)
   dart_sdk = GetDartSdkDirectory('Release', arch)
-  with TempDir() as temp_dir:
+  with utils.TempDir('eclipse') as temp_dir:
     # Get dartium
     dartium_directory = DownloadDartium(temp_dir, 'dartium-mac.zip')
     dartium_bundle_dir = os.path.join(dartium_directory,
                                       'Chromium.app')
 
     # Build the editor bundle
     darteditor_bundle_dir = os.path.join(temp_dir, 'DartEditor.app')
     args = [mac_build_bundle_py, darteditor_bundle_dir, editor_dir,
            dart_sdk, dartium_bundle_dir, dart_icns]
     RunProcess(args)
@@ skipping 18 matching lines @@
 
   for arch in architectures:
     with bot.BuildStep('Build Editor %s' % arch):
       args = [sys.executable, build_py,
               '-mrelease', '--arch=%s' % arch, 'editor', 'create_sdk']
       RunProcess(args)
 
   for arch in test_architectures:
     editor_executable = GetEditorExecutable('Release', arch)
     with bot.BuildStep('Test Editor %s' % arch):
-      with TempDir() as temp_dir:
+      with utils.TempDir('eclipse') as temp_dir:
         args = [editor_executable, '-consoleLog', '--test', '--auto-exit',
                 '-data', temp_dir]
         RunProcess(args)
 
   # TODO: Permissions need to be clarified
   for arch in test_architectures:
     with bot.BuildStep('Build Installer %s' % arch):
       if sys.platform == 'darwin':
         CreateAndUploadMacInstaller(arch)
       else:
         print ("We currently don't build installers for sys.platform=%s"
                 % sys.platform)
   return 0
 
 if __name__ == '__main__':
   try:
     sys.exit(main())
   except OSError as e:
     sys.exit(e.errno)