Revert "Fix potential flakiness of SocketStreamCloseTest."

tests/standalone/src/SocketCloseTest.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.
 //
-// VMOptions=
-// VMOptions=--short_socket_read
-// VMOptions=--short_socket_write
-// VMOptions=--short_socket_read --short_socket_write
-//
 // Test socket close events.
 
 #import("dart:io");
 
 final SERVERSHUTDOWN = -1;
 final ITERATIONS = 10;
 
 
 class SocketClose {
 
@@ skipping 74 matching lines @@
     void errorHandler() {
       _errorEvents++;
       _socket.close();
     }
 
     void connectHandler() {
       _socket.dataHandler = dataHandler;
       _socket.closeHandler = closeHandler;
       _socket.errorHandler = errorHandler;
 
-      void writeHello() {
-        int bytesWritten = 0;
-        while (bytesWritten != 5) {
-          bytesWritten += _socket.writeList("Hello".charCodes(),
-                                            bytesWritten,
-                                            5 - bytesWritten);
-        }
-      }
-
       _iterations++;
       switch (_mode) {
         case 0:
           _socket.close();
           proceed();
           break;
         case 1:
-          writeHello();
+          int bytesWritten = _socket.writeList("Hello".charCodes(), 0, 5);
+          Expect.equals(5, bytesWritten);
           _socket.close();
           proceed();
           break;
         case 2:
         case 3:
-          writeHello();
+          int bytesWritten = _socket.writeList("Hello".charCodes(), 0, 5);
+          Expect.equals(5, bytesWritten);
           break;
         case 4:
-          writeHello();
+          int bytesWritten = _socket.writeList("Hello".charCodes(), 0, 5);
+          Expect.equals(5, bytesWritten);
           _socket.close(true);
           break;
         case 5:
-          writeHello();
+          int bytesWritten = _socket.writeList("Hello".charCodes(), 0, 5);
+          Expect.equals(5, bytesWritten);
           break;
         case 6:
-          writeHello();
+          int bytesWritten = _socket.writeList("Hello".charCodes(), 0, 5);
+          Expect.equals(5, bytesWritten);
           _socket.close(true);
           break;
         default:
           Expect.fail("Unknown test mode");
       }
     }
 
     _socket = new Socket(SocketCloseServer.HOST, _port);
     Expect.equals(true, _socket !== null);
     _socket.connectHandler = connectHandler;
@@ skipping 58 matching lines @@
     void connectionHandler(Socket connection) {
 
       void readBytes(whenFiveBytes) {
         List<int> b = new List<int>(100);
         _readBytes += connection.readList(b, 0, 100);
         if ((_readBytes % 5) == 0) {
           whenFiveBytes();
         }
       }
 
-      void writeHello() {
-        int bytesWritten = 0;
-        while (bytesWritten != 5) {
-          bytesWritten += connection.writeList("Hello".charCodes(),
-                                               bytesWritten,
-                                               5 - bytesWritten);
-        }
-      }
-
       void dataHandler() {
+        _dataEvents++;
         switch (_mode) {
           case 0:
             Expect.fail("No data expected");
             break;
           case 1:
-            readBytes(() { _dataEvents++; });
+            readBytes(() { });
             break;
           case 2:
             readBytes(() {
-              _dataEvents++;
               connection.close();
             });
             break;
           case 3:
             readBytes(() {
-              _dataEvents++;
-              writeHello();
+              connection.writeList("Hello".charCodes(), 0, 5);
               connection.close();
             });
             break;
           case 4:
             readBytes(() {
-              _dataEvents++;
-              writeHello();
+              connection.writeList("Hello".charCodes(), 0, 5);
             });
             break;
           case 5:
           case 6:
             readBytes(() {
-              _dataEvents++;
-              writeHello();
+              connection.writeList("Hello".charCodes(), 0, 5);
               connection.close(true);
             });
             break;
           default:
             Expect.fail("Unknown test mode");
         }
       }
 
       void closeHandler() {
         _closeEvents++;
@@ skipping 92 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);
 }