Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1700)

Unified Diff: tests/standalone/io/raw_secure_server_closing_test.dart

Issue 201993002: Fix SecureSocket tests to look up localhost only once, where possible. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Remove useless change to https_client_certificate_test.dart Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/standalone/io/https_server_test.dart ('k') | tests/standalone/io/raw_secure_server_socket_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/standalone/io/raw_secure_server_closing_test.dart
diff --git a/tests/standalone/io/raw_secure_server_closing_test.dart b/tests/standalone/io/raw_secure_server_closing_test.dart
index c38ab58860b5430d34d399734a624d9800854cfb..16fffe34e136ad90c512349cc6b010408e1d1675 100644
--- a/tests/standalone/io/raw_secure_server_closing_test.dart
+++ b/tests/standalone/io/raw_secure_server_closing_test.dart
@@ -12,9 +12,8 @@ import "dart:io";
import "package:async_helper/async_helper.dart";
import "package:expect/expect.dart";
-import "package:path/path.dart";
-const HOST_NAME = "localhost";
+InternetAddress HOST;
const CERTIFICATE = "localhost_cert";
void testCloseOneEnd(String toClose) {
@@ -26,7 +25,7 @@ void testCloseOneEnd(String toClose) {
.then((_) {
asyncEnd();
});
- RawSecureServerSocket.bind(HOST_NAME, 0, CERTIFICATE).then((server) {
+ RawSecureServerSocket.bind(HOST, 0, CERTIFICATE).then((server) {
server.listen((serverConnection) {
serverConnection.listen((event) {
if (toClose == "server" || event == RawSocketEvent.READ_CLOSED) {
@@ -40,7 +39,7 @@ void testCloseOneEnd(String toClose) {
onDone: () {
serverDone.complete(null);
});
- RawSecureSocket.connect(HOST_NAME, server.port).then((clientConnection) {
+ RawSecureSocket.connect(HOST, server.port).then((clientConnection) {
clientConnection.listen((event){
if (toClose == "client" || event == RawSocketEvent.READ_CLOSED) {
clientConnection.shutdown(SocketDirection.SEND);
@@ -56,8 +55,8 @@ void testCloseOneEnd(String toClose) {
void testCloseBothEnds() {
asyncStart();
- RawSecureServerSocket.bind(HOST_NAME, 0, CERTIFICATE).then((server) {
- var clientEndFuture = RawSecureSocket.connect(HOST_NAME, server.port);
+ RawSecureServerSocket.bind(HOST, 0, CERTIFICATE).then((server) {
+ var clientEndFuture = RawSecureSocket.connect(HOST, server.port);
server.listen((serverEnd) {
clientEndFuture.then((clientEnd) {
clientEnd.close();
@@ -76,7 +75,7 @@ testPauseServerSocket() {
asyncStart();
- RawSecureServerSocket.bind(HOST_NAME,
+ RawSecureServerSocket.bind(HOST,
0,
CERTIFICATE,
backlog: 2 * socketCount).then((server) {
@@ -97,7 +96,7 @@ testPauseServerSocket() {
subscription.pause();
var connectCount = 0;
for (int i = 0; i < socketCount; i++) {
- RawSecureSocket.connect(HOST_NAME, server.port).then((connection) {
+ RawSecureSocket.connect(HOST, server.port).then((connection) {
connection.shutdown(SocketDirection.SEND);
});
}
@@ -105,7 +104,7 @@ testPauseServerSocket() {
subscription.resume();
resumed = true;
for (int i = 0; i < socketCount; i++) {
- RawSecureSocket.connect(HOST_NAME, server.port).then((connection) {
+ RawSecureSocket.connect(HOST, server.port).then((connection) {
connection.shutdown(SocketDirection.SEND);
});
}
@@ -118,7 +117,7 @@ testCloseServer() {
asyncStart();
List ends = [];
- RawSecureServerSocket.bind(HOST_NAME, 0, CERTIFICATE).then((server) {
+ RawSecureServerSocket.bind(HOST, 0, CERTIFICATE).then((server) {
Expect.isTrue(server.port > 0);
void checkDone() {
if (ends.length < 2 * socketCount) return;
@@ -135,7 +134,7 @@ testCloseServer() {
});
for (int i = 0; i < socketCount; i++) {
- RawSecureSocket.connect(HOST_NAME, server.port).then((connection) {
+ RawSecureSocket.connect(HOST, server.port).then((connection) {
ends.add(connection);
checkDone();
});
@@ -145,11 +144,19 @@ testCloseServer() {
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() {
testCloseOneEnd("client");
testCloseOneEnd("server");
testCloseBothEnds();
« no previous file with comments | « tests/standalone/io/https_server_test.dart ('k') | tests/standalone/io/raw_secure_server_socket_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698