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

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

Issue 2566273007: Fix flaky timeouts of socket_ipv6_test. (Closed)
Patch Set: fix multi-test numbering Created 4 years 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 | « no previous file | tests/standalone/io/test_utils.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/standalone/io/socket_ipv6_test.dart
diff --git a/tests/standalone/io/socket_ipv6_test.dart b/tests/standalone/io/socket_ipv6_test.dart
index 54f8a5018b1ea478065c0653c4e44b94e6f4ffa2..56f1ba1e0bb9f1a623bf581353baf459df0a4a91 100644
--- a/tests/standalone/io/socket_ipv6_test.dart
+++ b/tests/standalone/io/socket_ipv6_test.dart
@@ -6,6 +6,7 @@ import 'dart:io';
import "package:async_helper/async_helper.dart";
import "package:expect/expect.dart";
+import "test_utils.dart" show retrySync;
const ANY = InternetAddressType.ANY;
@@ -13,7 +14,7 @@ void testIPv6toIPv6() {
asyncStart();
InternetAddress.lookup("::0", type: ANY).then((serverAddr) {
InternetAddress.lookup("::1", type: ANY).then((clientAddr) {
- ServerSocket.bind(serverAddr.first, 0).then((server) {
+ ServerSocket.bind(serverAddr.first, 0).then((server) {
Expect.equals('::0', server.address.host);
Expect.equals('::', server.address.address);
server.listen((socket) {
@@ -32,7 +33,7 @@ void testIPv6toIPv6() {
void testIPv4toIPv6() {
asyncStart();
InternetAddress.lookup("::0", type: ANY).then((serverAddr) {
- ServerSocket.bind(serverAddr.first, 0).then((server) {
+ ServerSocket.bind(serverAddr.first, 0).then((server) {
Expect.equals('::0', server.address.host);
Expect.equals('::', server.address.address);
server.listen((socket) {
@@ -50,13 +51,18 @@ void testIPv4toIPv6() {
void testIPv6toIPv4() {
asyncStart();
InternetAddress.lookup("::1", type: ANY).then((clientAddr) {
- ServerSocket.bind("127.0.0.1", 0).then((server) {
+ ServerSocket.bind("127.0.0.1", 0).then((server) {
Expect.equals('127.0.0.1', server.address.host);
Expect.equals('127.0.0.1', server.address.address);
server.listen((socket) {
throw "Unexpected socket";
});
- Socket.connect(clientAddr.first, server.port).catchError((e) {
+ Socket.connect(clientAddr.first, server.port).then((socket) {
+ socket.destroy();
+ server.close();
+ asyncEnd();
+ throw "Unexpected connect";
kustermann 2016/12/13 21:04:30 This throw will be caught by the next line and sil
Florian Schneider 2016/12/13 22:12:33 Thanks! Does Socket.connect ever throw a String?
kustermann 2016/12/13 22:55:29 I don't think so. It's mostly some [SocketExceptio
+ }).catchError((e) {
server.close();
asyncEnd();
});
@@ -115,21 +121,28 @@ void testIPv4toIPv6_IPV6Only() {
server.listen((socket) {
throw "Unexpected socket";
});
- Socket.connect("127.0.0.1", server.port).catchError((error) {
- server.close();
- asyncEnd();
- });
+ Socket.connect("127.0.0.1", server.port)
+ .then((socket) {
+ socket.destroy();
+ server.close();
+ asyncEnd();
+ throw "Unexpected connect";
+ })
+ .catchError((error) {
+ server.close();
+ asyncEnd();
+ });
kustermann 2016/12/13 21:04:30 same here.
Florian Schneider 2016/12/13 22:12:33 Done. Reformatted here as well to match the other
});
});
}
void main() {
- testIPv6toIPv6(); /// none: ok
- testIPv4toIPv6(); /// 01: ok
- testIPv6toIPv4(); /// 02: ok
- testIPv4toIPv4(); /// 03: ok
- testIPv6Lookup(); /// 04: ok
- testIPv4Lookup(); /// 05: ok
+ testIPv6toIPv6(); /// 01: ok
+ testIPv4toIPv6(); /// 02: ok
+ testIPv4toIPv4(); /// 03: ok
+ testIPv6Lookup(); /// 04: ok
+ testIPv4Lookup(); /// 05: ok
- testIPv4toIPv6_IPV6Only(); /// 06: ok
+ retrySync(testIPv6toIPv4); /// 06: ok
+ retrySync(testIPv4toIPv6_IPV6Only); /// 07: ok
kustermann 2016/12/13 21:04:30 You can't use retrySync, because these functions a
Florian Schneider 2016/12/13 22:12:33 Aaah. Async code. The void confusd me. Done. (Str
}
« no previous file with comments | « no previous file | tests/standalone/io/test_utils.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698