Clean up secure socket connect.

tests/standalone/io/raw_secure_server_socket_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 "dart:async";
@@ skipping 454 matching lines @@
 
   if (listenSecure) {
     RawSecureServerSocket.bind(
         HOST, 0, CERTIFICATE).then(serverReady);
   } else {
     RawServerSocket.bind(HOST, 0).then(serverReady);
   }
 }
 
 testPausedSecuringSubscription(bool pausedServer, bool pausedClient) {
-  bool expectFail = pausedServer || pausedClient;
-
   asyncStart();
   var clientComplete = new Completer();
   RawServerSocket.bind(HOST, 0).then((server) {
     server.listen((client) {
       var subscription;
       subscription = client.listen((_) {
         if (pausedServer) {
           subscription.pause();
         }
-        RawSecureSocket.secureServer(
-            client, CERTIFICATE, subscription: subscription).then((client) {
-          if (expectFail) {
-            Expect.fail("secureServer succeeded with paused subscription");
-          }
-        }).catchError((e) {
-          if (!expectFail) {
-            Expect.fail("secureServer failed with non-paused subscriptions");
-          }
-          if (pausedServer) {
-            Expect.isTrue(e is StateError);
-          }
-        }).whenComplete(() {
+        void done() {
           server.close();
           clientComplete.future.then((_) {
             client.close();
             asyncEnd();
           });
-        });
+        }
+        try {
+          RawSecureSocket.secureServer(
+              client, CERTIFICATE, subscription: subscription)
+            .catchError((_) {})
+            .whenComplete(() {
+              if (pausedServer) {
+                Expect.fail("secureServer succeeded with paused subscription");
+              }
+              done();
+            });
+        } catch (e) {
+          if (!pausedServer) {
+            Expect.fail("secureServer failed with non-paused subscriptions");
+          }
+          if (pausedServer) {
+            Expect.isTrue(e is ArgumentError);
+          }
+          done();
+        }
       });
     });
 
     RawSocket.connect(HOST, server.port).then((socket) {
       var subscription;
       subscription = socket.listen((_) {
         if (pausedClient) {
           subscription.pause();
         }
-        RawSecureSocket.secure(
-            socket, subscription: subscription).then((socket) {
-          if (expectFail) {
-            Expect.fail("secure succeeded with paused subscription");
-          }
-          socket.close();
-        }).catchError((e) {
-          if (!expectFail) {
+        try {
+          RawSecureSocket.secure(
+              socket, subscription: subscription)
+            .catchError((_) {})
+            .whenComplete(() {
+              if (pausedClient) {
+                Expect.fail("secure succeeded with paused subscription");
+              }
+              socket.close();
+              clientComplete.complete(null);
+            });
+        } catch (e) {
+          if (!pausedClient) {
             Expect.fail("secure failed with non-paused subscriptions ($e)");
           }
           if (pausedClient) {
-            Expect.isTrue(e is StateError);
+            Expect.isTrue(e is ArgumentError);
           }
-        }).whenComplete(() {
           clientComplete.complete(null);
-        });
+        }
       });
     });
   });
 }
 
 main() {
   asyncStart();
   var certificateDatabase = Platform.script.resolve('pkcert').toFilePath();
   SecureSocket.initialize(database: certificateDatabase,
                           password: 'dartdart',
                           useBuiltinRoots: false);
   InternetAddress.lookup("localhost").then((hosts) {
     HOST = hosts.first;
     runTests();
     asyncEnd();
   });
 }
 
 runTests() {
   testSimpleBind();
   testInvalidBind();
   testSimpleConnect(CERTIFICATE);
   testSimpleConnect("CN=localhost");
   testSimpleConnectFail("not_a_nickname", false);
   testSimpleConnectFail("CN=notARealDistinguishedName", false);
   testSimpleConnectFail("not_a_nickname", true);
   testSimpleConnectFail("CN=notARealDistinguishedName", true);
   testServerListenAfterConnect();
+
   testSimpleReadWrite(listenSecure: true,
                       connectSecure: true,
                       handshakeBeforeSecure: false,
                       postponeSecure: false,
                       dropReads: false);
   testSimpleReadWrite(listenSecure: true,
                       connectSecure: false,
                       handshakeBeforeSecure: false,
                       postponeSecure: false,
                       dropReads: false);
@@ skipping 25 matching lines @@
   testSimpleReadWrite(listenSecure: false,
                       connectSecure: false,
                       handshakeBeforeSecure: true,
                       postponeSecure: true,
                       dropReads: true);
   testPausedSecuringSubscription(false, false);
   testPausedSecuringSubscription(true, false);
   testPausedSecuringSubscription(false, true);
   testPausedSecuringSubscription(true, true);
 }