Big merge from experimental to bleeding edge.

utils/tests/pub/version_solver_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.
 
 library pub_update_test;
 
+import 'dart:async';
 import 'dart:io';
-import 'dart:isolate';
 
 import '../../pub/lock_file.dart';
 import '../../pub/package.dart';
 import '../../pub/pubspec.dart';
 import '../../pub/root_source.dart';
 import '../../pub/source.dart';
 import '../../pub/source_registry.dart';
 import '../../pub/system_cache.dart';
 import '../../pub/utils.dart';
 import '../../pub/version.dart';
@@ skipping 426 matching lines @@
           if (actualId != expectedId) return false;
         }
         return result.isEmpty;
       }, 'packages to match $result')));
     } else if (error != null) {
       expect(future, throwsA(error));
     }
 
     // If we aren't expecting an error, print some debugging info if we get one.
     if (error == null) {
-      future.handleException((ex) {
+      future.catchError((ex) {
         print(ex);
         print(future.stackTrace);
-        return true;
       });
     }
   });
 }
 
 /// A source used for testing. This both creates mock package objects and acts
 /// as a source for them.
 ///
 /// In order to support testing packages that have the same name but different
 /// descriptions, a package's name is calculated by taking the description
 /// string and stripping off any trailing hyphen followed by non-hyphen
 /// characters.
 class MockSource extends Source {
   final Map<String, Map<Version, Package>> _packages;
 
   final String name;
   bool get shouldCache => true;
 
   MockSource(this.name)
       : _packages = <String, Map<Version, Package>>{};
 
   Future<List<Version>> getVersions(String name, String description) {
-    return fakeAsync(() => _packages[description].keys);
+    return fakeAsync(() => _packages[description].keys.toList());
   }
 
   Future<Pubspec> describe(PackageId id) {
     return fakeAsync(() {
       return _packages[id.name][id.version].pubspec;
     });
   }
 
   Future<bool> install(PackageId id, String path) {
     throw 'no';
@@ skipping 59 matching lines @@
   var match = new RegExp(r"(.*) from (.*)").firstMatch(name);
   if (match == null) return new Pair<String, Source>(name, source1);
   switch (match[2]) {
   case 'mock1': return new Pair<String, Source>(match[1], source1);
   case 'mock2': return new Pair<String, Source>(match[1], source2);
   case 'root': return new Pair<String, Source>(match[1], rootSource);
   case 'versionless':
     return new Pair<String, Source>(match[1], versionlessSource);
   }
 }