Version 2.14.0-327.0.dev
Merge commit '6a87d049acafbf4d8e251b9ab15b5c3623bcad61' into 'dev'
diff --git a/tests/standalone/io/unix_socket_test.dart b/tests/standalone/io/unix_socket_test.dart
index 6f9b487..d510fb6 100644
--- a/tests/standalone/io/unix_socket_test.dart
+++ b/tests/standalone/io/unix_socket_test.dart
@@ -12,8 +12,6 @@
var address = InternetAddress('$name/sock', type: InternetAddressType.unix);
var server = await ServerSocket.bind(address, 0);
- var type = FileSystemEntity.typeSync(address.address);
-
var client = await Socket.connect(address, server.port);
var completer = Completer<void>();
server.listen((socket) async {
@@ -90,8 +88,6 @@
// test if it is working correctly.
await socket.close();
- var type = FileSystemEntity.typeSync(address.address);
-
// For robustness we ignore any clients unrelated to this test.
List<int> sendData = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
socket2.listen((Socket client) async {
@@ -128,8 +124,6 @@
completer.complete();
});
- var type = FileSystemEntity.typeSync(address.address);
-
Socket client =
await Socket.connect(address, server.port, sourceAddress: localAddress);
Expect.equals(client.remoteAddress.address, address.address);
@@ -139,12 +133,12 @@
await server.close();
}
-Future testAbstractAddress() async {
+Future testAbstractAddress(String uniqueName) async {
if (!Platform.isLinux && !Platform.isAndroid) {
return;
}
var serverAddress =
- InternetAddress('@temp.sock', type: InternetAddressType.unix);
+ InternetAddress('@temp.sock.$uniqueName', type: InternetAddressType.unix);
ServerSocket server = await ServerSocket.bind(serverAddress, 0);
final completer = Completer<void>();
final content = 'random string';
@@ -172,7 +166,7 @@
return buffer.toString();
}
-Future testShortAbstractAddress() async {
+Future testShortAbstractAddress(String uniqueName) async {
if (!Platform.isLinux && !Platform.isAndroid) {
return;
}
@@ -182,7 +176,7 @@
Future? stdoutFuture;
Future? stderrFuture;
try {
- var socketAddress = '@hidden';
+ var socketAddress = '@temp.sock.$uniqueName';
var abstractSocketServer = getAbstractSocketTestFileName();
// check if the executable exists, some build configurations do not
// build it (e.g: precompiled simarm/simarm64)
@@ -190,7 +184,7 @@
return;
}
- // Start up a subprocess that listens on '@hidden'.
+ // Start up a subprocess that listens on [socketAddress].
process = await Process.start(abstractSocketServer, [socketAddress]);
stdoutFuture = process.stdout
.transform(const Utf8Decoder(allowMalformed: true))
@@ -454,10 +448,10 @@
void main() async {
try {
await withTempDir('unix_socket_test', (Directory dir) async {
- await testBind('${dir.path}');
+ await testAddress('${dir.path}');
});
await withTempDir('unix_socket_test', (Directory dir) async {
- await testAddress('${dir.path}');
+ await testBind('${dir.path}');
});
await withTempDir('unix_socket_test', (Directory dir) async {
await testBindShared('${dir.path}');
@@ -468,7 +462,9 @@
await withTempDir('unix_socket_test', (Directory dir) async {
await testSourceAddressConnect('${dir.path}');
});
- await testAbstractAddress();
+ await withTempDir('unix_socket_test', (Directory dir) async {
+ await testAbstractAddress(dir.uri.pathSegments.last);
+ });
await withTempDir('unix_socket_test', (Directory dir) async {
await testExistingFile('${dir.path}');
});
@@ -478,7 +474,9 @@
await withTempDir('unix_socket_test', (Directory dir) async {
await testHttpServer('${dir.path}');
});
- await testShortAbstractAddress();
+ await withTempDir('unix_socket_test', (Directory dir) async {
+ await testShortAbstractAddress(dir.uri.pathSegments.last);
+ });
} catch (e) {
if (Platform.isMacOS || Platform.isLinux || Platform.isAndroid) {
Expect.fail("Unexpected exception $e is thrown");
diff --git a/tests/standalone_2/io/unix_socket_test.dart b/tests/standalone_2/io/unix_socket_test.dart
index 7e3de7f..a82a155 100644
--- a/tests/standalone_2/io/unix_socket_test.dart
+++ b/tests/standalone_2/io/unix_socket_test.dart
@@ -14,8 +14,6 @@
var address = InternetAddress('$name/sock', type: InternetAddressType.unix);
var server = await ServerSocket.bind(address, 0);
- var type = FileSystemEntity.typeSync(address.address);
-
var client = await Socket.connect(address, server.port);
var completer = Completer<void>();
server.listen((socket) async {
@@ -92,8 +90,6 @@
// test if it is working correctly.
await socket.close();
- var type = FileSystemEntity.typeSync(address.address);
-
// For robustness we ignore any clients unrelated to this test.
List<int> sendData = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
socket2.listen((Socket client) async {
@@ -130,8 +126,6 @@
completer.complete();
});
- var type = FileSystemEntity.typeSync(address.address);
-
Socket client =
await Socket.connect(address, server.port, sourceAddress: localAddress);
Expect.equals(client.remoteAddress.address, address.address);
@@ -141,12 +135,12 @@
await server.close();
}
-Future testAbstractAddress() async {
+Future testAbstractAddress(String uniqueName) async {
if (!Platform.isLinux && !Platform.isAndroid) {
return;
}
var serverAddress =
- InternetAddress('@temp.sock', type: InternetAddressType.unix);
+ InternetAddress('@temp.sock.$uniqueName', type: InternetAddressType.unix);
ServerSocket server = await ServerSocket.bind(serverAddress, 0);
final completer = Completer<void>();
final content = 'random string';
@@ -174,7 +168,7 @@
return buffer.toString();
}
-Future testShortAbstractAddress() async {
+Future testShortAbstractAddress(String uniqueName) async {
if (!Platform.isLinux && !Platform.isAndroid) {
return;
}
@@ -184,7 +178,7 @@
var stdoutFuture;
var stderrFuture;
try {
- var socketAddress = '@hidden';
+ var socketAddress = '@temp.sock.$uniqueName';
var abstractSocketServer = getAbstractSocketTestFileName();
// check if the executable exists, some build configurations do not
// build it (e.g: precompiled simarm/simarm64)
@@ -192,7 +186,7 @@
return;
}
- // Start up a subprocess that listens on '@hidden'.
+ // Start up a subprocess that listens on [socketAddress].
process = await Process.start(abstractSocketServer, [socketAddress]);
stdoutFuture = process.stdout
.transform(const Utf8Decoder(allowMalformed: true))
@@ -470,7 +464,9 @@
await withTempDir('unix_socket_test', (Directory dir) async {
await testSourceAddressConnect('${dir.path}');
});
- await testAbstractAddress();
+ await withTempDir('unix_socket_test', (Directory dir) async {
+ await testAbstractAddress(dir.uri.pathSegments.last);
+ });
await withTempDir('unix_socket_test', (Directory dir) async {
await testExistingFile('${dir.path}');
});
@@ -480,7 +476,9 @@
await withTempDir('unix_socket_test', (Directory dir) async {
await testHttpServer('${dir.path}');
});
- await testShortAbstractAddress();
+ await withTempDir('unix_socket_test', (Directory dir) async {
+ await testShortAbstractAddress(dir.uri.pathSegments.last);
+ });
} catch (e) {
if (Platform.isMacOS || Platform.isLinux || Platform.isAndroid) {
Expect.fail("Unexpected exception $e is thrown");
diff --git a/tools/VERSION b/tools/VERSION
index fe662e4..a0d77cc 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 14
PATCH 0
-PRERELEASE 326
+PRERELEASE 327
PRERELEASE_PATCH 0
\ No newline at end of file
