Fix ALL the pub tests.

utils/pub/utils.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.
 
 /// Generic utility functions. Stuff that should possibly be in core.
 library utils;
 
 import 'dart:async';
 import 'dart:crypto';
 import 'dart:isolate';
@@ skipping 22 matching lines @@
   final result = new StringBuffer();
   result.add(source);
 
   while (result.length < length) {
     result.add(' ');
   }
 
   return result.toString();
 }
 
-/// Runs [fn] after [future] completes, whether it completes successfully or
-/// not. Essentially an asynchronous `finally` block.
-always(Future future, fn()) {
-  future.catchError((_) {}).then((_) => fn());
-}
-

[Bob Nystrom, 2013/01/09 16:49:23]

Yay!

 /// Flattens nested lists inside an iterable into a single list containing only
 /// non-list elements.
 List flatten(Iterable nested) {
   var result = [];
   helper(list) {
     for (var element in list) {
       if (element is List) {
         helper(element);
       } else {
         result.add(element);
@@ skipping 58 matching lines @@
   return completer.future;
 }
 
 /// Configures [future] so that its result (success or exception) is passed on
 /// to [completer].
 void chainToCompleter(Future future, Completer completer) {
   future.then((value) => completer.complete(value),
       onError: (e) => completer.completeError(e.error, e.stackTrace));
 }
 
+/// Like [Future.whenComplete], except that [action] may return a [Future]. If
+/// it does, the returned [Future] won't complete until [action]'s [Future]
+/// completes.
+///
+/// The returned [Future] always has the same value as [future].

[Bob Nystrom, 2013/01/09 16:49:23]

Since this is how then() and catchError() work, it seems like this should be the
default behavior for whenComplete() too. File a bug?

+Future asyncWhenComplete(Future future, Future action()) {
+  Future futurify(Future future) {
+    if (future != null) return future;
+    return new Future.immediate(null);
+  }
+
+  return future.then((result) => futurify(action()).then((_) => result),
+      onError: (e) {
+    return futurify(action()).then((_) {
+      throw e;
+    });
+  });
+}
+
 // TODO(nweiz): unify the following functions with the utility functions in
 // pkg/http.
 
 /// Like [String.split], but only splits on the first occurrence of the pattern.
 /// This will always return an array of two elements or fewer.
 List<String> split1(String toSplit, String pattern) {
   if (toSplit.isEmpty) return <String>[];
 
   var index = toSplit.indexOf(pattern);
   if (index == -1) return [toSplit];
@@ skipping 50 matching lines @@
 // TODO(rnystrom): Remove this when #7781 is fixed.
 /// When an error is rethrown in an async callback, you can end up with nested
 /// AsyncErrors. This unwraps them to find the real originating error.
 getRealError(error) {
   while (error is AsyncError) {
     error = error.error;
   }
 
   return error;
 }
+
+// TODO(rnystrom): Remove this when #7781 is fixed.

[Bob Nystrom, 2013/01/09 16:49:23]

"nweiz", not that it really matters. :)

+/// When an error is rethrown in an async callback, you can end up with nested
+/// AsyncErrors. This unwraps them to find the real originating stack trace.
+getRealStackTrace(error) {
+  var trace = null;
+  while (error is AsyncError) {
+    trace = error.stackTrace;
+    error = error.error;
+  }
+
+  return trace;
+}