Another attempt at fixing the Socket tests.

runtime/bin/socket_stream_impl.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.
 
 class _SocketInputStream implements SocketInputStream {
   _SocketInputStream(Socket socket) : _socket = socket {
+    if (_socket._id == -1) _closed = true;
     _socket.closeHandler = _closeHandler;
   }
 
   List<int> read([int len]) {
     int bytesToRead = available();
     if (bytesToRead == 0) return null;
     if (len !== null) {
       if (len <= 0) {
         throw new StreamException("Illegal length $len");
       } else if (bytesToRead > len) {
@@ skipping 27 matching lines @@
 
   int available() => _socket.available();
 
   void pipe(OutputStream output, [bool close = true]) {
     _pipe(this, output, close: close);
   }
 
   void close() {
     if (!_closed) {
       _socket.close();
-      if (_clientCloseHandler !== null) _clientCloseHandler();
     }
   }
 
   bool get closed() => _closed;
 
   void set dataHandler(void callback()) {
     _socket._dataHandler = callback;
   }
 
   void set closeHandler(void callback()) {
     _clientCloseHandler = callback;
     _socket._closeHandler = _closeHandler;
   }
 
   void set errorHandler(void callback()) {
     _socket.errorHandler = callback;
   }
 
   void _closeHandler() {
     _closed = true;
-    if (_clientCloseHandler !== null) _clientCloseHandler();
+    if (_clientCloseHandler !== null) {
+      _clientCloseHandler();
+    }
   }
 
   Socket _socket;
   Function _clientCloseHandler;
   bool _closed = false;
 }
 
 
 class _SocketOutputStream implements SocketOutputStream {
   _SocketOutputStream(Socket socket)
@@ skipping 27 matching lines @@
     _closed = true;
   }
 
   void set noPendingWriteHandler(void callback()) {
     _noPendingWriteHandler = callback;
     if (_noPendingWriteHandler != null) {
       _socket._writeHandler = _writeHandler;
     }
   }
 
-  void set closeHandler(void callback()) {

[Søren Gjesse, 2012/02/10 10:44:33]

We still have a closeHandler setter int the OutputStream interface. Maybe we
should leave this here for now. We have
http://code.google.com/p/dart/issues/detail?id=941 open on this issue.

-    _socket.closeHandler = callback;
-  }
-
   void set errorHandler(void callback()) {
     _streamErrorHandler = callback;
     if (_streamErrorHandler != null) {
       _socket.errorHandler = _errorHandler;
     } else {
       _socket.errorHandler = null;
     }
   }
 
   bool _write(List<int> buffer, int offset, int len, bool copyBuffer) {
@@ skipping 49 matching lines @@
     if (_streamErrorHandler != null) _streamErrorHandler();
   }
 
   Socket _socket;
   _BufferList _pendingWrites;
   var _noPendingWriteHandler;
   var _streamErrorHandler;
   bool _closing = false;
   bool _closed = false;
 }