Get more pub tests working.

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 86 matching lines @@
 
 /// Returns whether or not [str] ends with [matcher].
 bool endsWithPattern(String str, Pattern matcher) {
   for (var match in matcher.allMatches(str)) {
     if (match.end == str.length) return true;
   }
   return false;
 }
 
 /// Returns the hex-encoded sha1 hash of [source].
-String sha1(String source) =>
-  CryptoUtils.bytesToHex(new SHA1().add(source.charCodes).close());
+String sha1(String source) {
+  var sha = new SHA1();
+  sha.add(source.charCodes);
+  return CryptoUtils.bytesToHex(sha.close());
+}
 
 /// Returns a [Future] that completes in [milliseconds].
 Future sleep(int milliseconds) {
   var completer = new Completer();
-  new Timer(milliseconds, completer.complete);
+  new Timer(milliseconds, (_) => completer.complete());
   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(completer.complete)
     .catchError((e) {
       completer.completeError(e.error, e.stackTrace);
@@ skipping 63 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;
 }