Fix flakiness of SocketCloseTest by waiting for all close events.

tests/standalone/src/SocketCloseTest.dart

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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.
 //
 // Test socket close events.
 
 #import("dart:io");
 
 final SERVERSHUTDOWN = -1;
 final ITERATIONS = 10;
 
@@ skipping 242 matching lines @@
       connection.dataHandler = dataHandler;
       connection.closeHandler = closeHandler;
       connection.errorHandler = errorHandler;
     }
 
     void errorHandlerServer() {
       Expect.fail("Server socket error");
     }
 
     waitForResult(Timer timer) {
-      // Make sure all iterations have been run. For mode 0 and 1 the
-      // client just closes the socket and after the last iteration
-      // signals the server. The server might now be finished just
-      // because iterations have reached the limit as this number is
-      // incremented just after accept. In that case wait for the last
-      // close event.
-      if (_iterations == ITERATIONS &&
-          (_mode > 1 || _closeEvents == ITERATIONS)) {
+      // Make sure all iterations have been run. In multiple of these
+      // scenarios it is possible to get the SERVERSHUTDOWN message
+      // before we have received the last close event on the
+      // server. We therefore always wait for the correct number of
+      // close events.
+      if (_iterations == ITERATIONS && _closeEvents == ITERATIONS) {
         switch (_mode) {
           case 0:
             Expect.equals(0, _dataEvents);
             Expect.equals(ITERATIONS, _closeEvents);
             break;
           case 1:
             Expect.equals(ITERATIONS, _dataEvents);
             Expect.equals(ITERATIONS, _closeEvents);
             break;
           case 2:
@@ skipping 57 matching lines @@
   // 5: Client sends. Server responds and half closes.
   // 6: Client sends and half-closes. Server responds and half closes.
   new SocketClose.start(0);
   new SocketClose.start(1);
   new SocketClose.start(2);
   new SocketClose.start(3);
   new SocketClose.start(4);
   new SocketClose.start(5);
   new SocketClose.start(6);
 }