Big merge from experimental to bleeding edge.

tests/lib/async/future_delayed_error_test.dart

Index: tests/lib/async/future_delayed_error_test.dart
diff --git a/tests/lib/async/future_delayed_error_test.dart b/tests/lib/async/future_delayed_error_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..a3fea32a5694c2ae41c04418022ec349be44beac
--- /dev/null
+++ b/tests/lib/async/future_delayed_error_test.dart
@@ -0,0 +1,37 @@
+// 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.
+
+import 'dart:async';
+import 'dart:isolate';
+
+testImmediateError() {
+  // An open ReceivePort keeps the VM running. If the error-handler below is not
+  // executed then the test will fail with a timeout.
+  var port = new ReceivePort();
+  var future = new Future.immediateError("error");
+  future.catchError((e) {
+    port.close();
+    Expect.equals(e.error, "error");
+  });
+}
+
+Future get completedFuture {
+  var completer = new Completer();
+  completer.completeError("foobar");
+  return completer.future;
+}
+
+testDelayedError() {
+  var port = new ReceivePort();
+  completedFuture.catchError((e) {
+    port.close();
+    Expect.equals(e.error, "foobar");
+  });
+}
+
+main() {
+  testImmediateError();
+  testDelayedError();
+}
+