Fix ALL the pub tests.

utils/tests/pub/test_pub.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.
 
 /// Test infrastructure for testing pub. Unlike typical unit tests, most pub
 /// tests are integration tests that stage some stuff on the file system, run
 /// pub, and then validate the results. This library provides an API to build
 /// tests like that.
 library test_pub;
 
@@ skipping 442 matching lines @@
   Future cleanup() {
     return _runScheduled(createdSandboxDir, _scheduledCleanup).then((_) {
       _scheduled = null;
       _scheduledCleanup = null;
       _scheduledOnException = null;
       if (createdSandboxDir != null) return deleteDir(createdSandboxDir);
       return new Future.immediate(null);
     });
   }
 
-  final future = _setUpSandbox().then((sandboxDir) {
+  timeout(_setUpSandbox().then((sandboxDir) {
     createdSandboxDir = sandboxDir;
     return _runScheduled(sandboxDir, _scheduled);
-  });
-
-  future.catchError((e) {
+  }).catchError((e) {
     // If an error occurs during testing, delete the sandbox, throw the error so
     // that the test framework sees it, then finally call asyncDone so that the
     // test framework knows we're done doing asynchronous stuff.
-    var subFuture = _runScheduled(createdSandboxDir, _scheduledOnException)
-        .then((_) => cleanup());
-    subFuture.catchError((e) {
+    return _runScheduled(createdSandboxDir, _scheduledOnException)
+        .then((_) => registerException(e.error, e.stackTrace)).catchError((e) {
       print("Exception while cleaning up: ${e.error}");
       print(e.stackTrace);
       registerException(e.error, e.stackTrace);
-      return true;
     });
-    subFuture.then((_) => registerException(e.error, e.stackTrace));
-    return true;
-  });
-
-  timeout(future, _TIMEOUT, 'waiting for a test to complete')
+  }), _TIMEOUT, 'waiting for a test to complete')
       .then((_) => cleanup())
       .then((_) => asyncDone());
 }
 
 /// Get the path to the root "util/test/pub" directory containing the pub
 /// tests.
 String get testDirectory {
   var dir = new Options().script;
   while (basename(dir) != 'pub') dir = dirname(dir);
 
@@ skipping 339 matching lines @@
         var error = new StringBuffer();
         error.add("No files named $name in $dir were valid:\n");
         for (var failure in failures) {
           error.add("  $failure\n");
         }
         completer.completeError(
             new ExpectException(error.toString()), stackTrace);
       }
 
       for (var match in matches) {
-        var future = validate(match);
-
-        future.catchError((e) {
+        var future = validate(match).then((_) {
+          successes++;
+          checkComplete();
+        }).catchError((e) {
           failures.add(e);
           checkComplete();
         });
-
-        future.then((_) {
-          successes++;
-          checkComplete();
-        }).catchError((_) {});
       }
       return completer.future;
     });
   }
 }
 
 /// Describes a file. These are used both for setting up an expected directory
 /// tree before running a test, and for validating that the file system matches
 /// some expectations after running it.
 class FileDescriptor extends Descriptor {
@@ skipping 248 matching lines @@
 
     var sinkStream = new ListInputStream();
     var tempDir;
     // TODO(rnystrom): Use withTempDir() here.
     // TODO(nweiz): propagate any errors to the return value. See issue 3657.
     createTempDir().then((_tempDir) {
       tempDir = _tempDir;
       return create(tempDir);
     }).then((tar) {
       var sourceStream = tar.openInputStream();
-      pipeInputToInput(sourceStream, sinkStream).then((_) {
+      return pipeInputToInput(sourceStream, sinkStream).then((_) {
         tempDir.delete(recursive: true);
       });
     });
     return sinkStream;
   }
 }
 
 /// A descriptor that validates that no file exists with the given name.
 class NothingDescriptor extends Descriptor {
   NothingDescriptor(String name) : super(name);
@@ skipping 417 matching lines @@
 /// calling [completion] is unnecessary.
 void expectLater(Future actual, matcher, {String reason,
     FailureHandler failureHandler, bool verbose: false}) {
   _schedule((_) {
     return actual.then((value) {
       expect(value, matcher, reason: reason, failureHandler: failureHandler,
           verbose: false);
     });
   });
 }