Fixed tests to reliably clean up temporary files/directories

tests/standalone/io/skipping_dart2js_compilations_test.dart

 // 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.
 
 /*
  * This test makes sure that the "skipping Dart2Js compilations if the output is
  * already up to date" feature does work as it should.
  * Therefore this test ensures that compilations are only skipped if the last
  * modified date of the output of a dart2js compilation is newer than
  *   - the the dart application to compile (including it's dependencies)
@@ skipping 123 matching lines @@
     Expect.isFalse(output.unexpectedOutput);
     Expect.isTrue(output.stderr.length == 0);
     if (_shouldHaveRun) {
       Expect.isTrue(output.stdout.length == 0);
       Expect.isTrue(new File(fileUtils.scriptOutputPath.toNativePath())
           .existsSync());
     } else {
       Expect.isFalse(new File(fileUtils.scriptOutputPath.toNativePath())
           .existsSync());
     }
-    fileUtils.cleanup();
   }
 }
 
-runner.TestCase makeTestCase(String testName,
-                             TestCompletedHandler completedHandler) {
-  var fileUtils = completedHandler.fileUtils;
+runner.TestCase makeTestCase(String testName, FileUtils fileUtils) {
   var config = new options.TestOptionsParser().parse(['--timeout', '2'])[0];
   var scriptDirPath = new Path(new Options().script).directoryPath;
   var createFileScript = scriptDirPath.
       append('skipping_dart2js_compilations_helper.dart').toNativePath();
   var executable = new Options().executable;
   var arguments = [createFileScript, fileUtils.scriptOutputPath.toNativePath()];
   var bootstrapDeps = [
       new Uri("file://${fileUtils.testSnapshotFilePath}")];
   var commands = [new runner.CompilationCommand(
       fileUtils.testJsFilePath.toNativePath(),
       false,
       bootstrapDeps,
       executable,
       arguments)];
   return new runner.TestCase(
       testName,
       commands,
       config,
-      completedHandler.processCompletedTest,
+      (_) {},
       new Set<String>.from([status.PASS]));
 }
 
 void main() {
   var fs_noTestJs = new FileUtils(createJs: false,
                                   createJsDeps: true,
                                   createDart: true,
                                   createSnapshot: true);
   var fs_noTestJsDeps = new FileUtils(createJs: true,
                                       createJsDeps: false,
@@ skipping 12 matching lines @@
                                               createDart: true,
                                               createSnapshot: true);
   var fs_notUpToDate_dart = new FileUtils(createJs: true,
                                           createJsDeps: true,
                                           createDart: true,
                                           createSnapshot: true);
   var fs_upToDate = new FileUtils(createJs: true,
                                   createJsDeps: true,
                                   createDart: true,
                                   createSnapshot: true);
+  void cleanup() {
+    fs_noTestJs.cleanup();
+    fs_noTestJsDeps.cleanup();
+    fs_noTestDart.cleanup();
+    fs_noTestSnapshot.cleanup();
+    fs_notUpToDate_snapshot.cleanup();
+    fs_notUpToDate_dart.cleanup();
+    fs_upToDate.cleanup();
+  }
 
   void touchFilesAndRunTests() {
     fs_notUpToDate_snapshot.touchFile(fs_notUpToDate_snapshot.testSnapshot);
     fs_notUpToDate_dart.touchFile(fs_notUpToDate_dart.testDart);
     fs_upToDate.touchFile(fs_upToDate.testJs);
 
-    void runTest(String name, FileUtils fileUtils, bool shouldRun) {
-      var testCase = makeTestCase(
-          name, new TestCompletedHandler(fileUtils, shouldRun));
-      new runner.RunningProcess(testCase, testCase.commands[0]).start();
+    Future runTest(String name, FileUtils fileUtils, bool shouldRun) {
+      var completedHandler = new TestCompletedHandler(fileUtils, shouldRun);
+      var testCase = makeTestCase(name, fileUtils);
+      var process = new runner.RunningProcess(testCase, testCase.commands[0]);
+      return process.start().then((_) {
+        completedHandler.processCompletedTest(testCase);
+      });
     }
-    runTest("fs_noTestJs", fs_noTestJs, true);
-    runTest("fs_noTestJsDeps", fs_noTestJsDeps, true);
-    runTest("fs_noTestDart", fs_noTestDart, true);
-    runTest("fs_noTestSnapshot", fs_noTestSnapshot, true);
-    runTest("fs_notUpToDate_snapshot", fs_notUpToDate_snapshot, true);
-    runTest("fs_notUpToDate_dart", fs_notUpToDate_dart, true);
-    // This is the only test where all dependencies are present and the test.js
-    // file is newer than all the others. So we pass 'false' for shouldRun.
-    runTest("fs_upToDate", fs_upToDate, false);
+    // We run the tests in sequence, so that if one of them failes we clean up
+    // everything and throw.
+    runTest("fs_noTestJs", fs_noTestJs, true).then((_) {
+      return runTest("fs_noTestJsDeps", fs_noTestJsDeps, true);
+    }).then((_) {
+      return runTest("fs_noTestDart", fs_noTestDart, true);
+    }).then((_) {
+      return runTest("fs_noTestSnapshot", fs_noTestSnapshot, true);
+    }).then((_) {
+      return runTest("fs_notUpToDate_snapshot", fs_notUpToDate_snapshot, true);
+    }).then((_) {
+      return runTest("fs_notUpToDate_dart", fs_notUpToDate_dart, true);
+    }).then((_) {
+      // This is the only test where all dependencies are present and the
+      // test.js file is newer than all the others. So we pass 'false' for
+      // shouldRun.
+      return runTest("fs_upToDate", fs_upToDate, false);
+    }).catchError((error) {
+      cleanup();
+      throw error;
+    }).then((_) {
+      cleanup();
+    });
   }
   // We need to wait some time to make sure that the files we 'touch' get a
   // bigger timestamp than the old ones
   new Timer(new Duration(seconds: 1), touchFilesAndRunTests);
 }