Version 0.5.11.1

dart/tests/standalone/io/http_server_early_client_close_test.dart

 // Copyright (c) 2013, 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.
 //
 // VMOptions=
 // VMOptions=--short_socket_read
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
 import "package:expect/expect.dart";
 import "dart:async";
 import "dart:io";
 import "dart:isolate";
 
 Future sendData(List<int> data, int port) {
   return Socket.connect("127.0.0.1", port).then((socket) {
     socket.listen((data) {
         Expect.fail("No data response was expected");
       });
     socket.add(data);
-    socket.done.then((_) {
-      socket.destroy();
-    });
-    return socket.close();
+    return socket.close()
+        .then((_) {
+          socket.destroy();
+        });
   });
 }
 
 class EarlyCloseTest {
   EarlyCloseTest(this.data,
                  [String this.exception,
                   bool this.expectRequest = false]);
 
   Future execute() {
     return HttpServer.bind("127.0.0.1", 0).then((server) {
       Completer c = new Completer();
 
       bool calledOnRequest = false;
       bool calledOnError = false;
       bool calledOnDone = false;
       ReceivePort port = new ReceivePort();
+      var requestCompleter = new Completer();
       server.listen(
           (request) {
             Expect.isTrue(expectRequest);
             Expect.isFalse(calledOnError);
             Expect.isFalse(calledOnRequest, "onRequest called multiple times");
             calledOnRequest = true;
             request.listen(
                 (_) {},
+                onDone: () {
+                  requestCompleter.complete();
+                },
                 onError: (error) {
                   Expect.isFalse(calledOnError);
                   Expect.equals(exception, error.message);
                   calledOnError = true;
                   if (exception != null) port.close();
                 });
-            server.close();
           },
           onDone: () {
             Expect.equals(expectRequest, calledOnRequest);
             calledOnDone = true;
             if (exception == null) port.close();
             c.complete(null);
           });
 
       List<int> d;
       if (data is List<int>) d = data;
       if (data is String) d = data.codeUnits;
       if (d == null) Expect.fail("Invalid data");
       sendData(d, server.port)
          .then((_) {
-            if (!expectRequest) server.close();
+            if (!expectRequest) requestCompleter.complete();
+            requestCompleter.future.then((_) => server.close());
           });
 
       return c.future;
     });
   }
 
   final data;
   final String exception;
   final bool expectRequest;
 }
@@ skipping 81 matching lines @@
           socket.done.catchError((_) {});
         });
   });
 }
 
 void main() {
   testEarlyClose1();
   testEarlyClose2();
   testEarlyClose3();
 }