Skip to content

Commit 2635b7a

Browse files
committed
Revert "ensure to use the IPAddress.(IPv6)Any to connect to the test node"
This reverts commit c97fb30.
1 parent 2f56b08 commit 2635b7a

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed

tests/Smdn.Net.MuninNode/Smdn.Net.MuninNode/NodeBase.cs

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,25 +52,19 @@ protected override EndPoint GetLocalEndPointToBind()
5252
: throw new NotSupportedException(),
5353
port: 0
5454
);
55-
56-
public IPEndPoint LocalEndPointToConnect
57-
=> new(
58-
address: Socket.OSSupportsIPv6 ? IPAddress.IPv6Any : IPAddress.Any,
59-
port: ((IPEndPoint)LocalEndPoint).Port
60-
);
6155
}
6256

63-
private static TestLocalNode CreateNode()
57+
private static NodeBase CreateNode()
6458
=> CreateNode(accessRule: null, plugins: Array.Empty<IPlugin>());
6559

66-
private static TestLocalNode CreateNode(IAccessRule? accessRule)
60+
private static NodeBase CreateNode(IAccessRule? accessRule)
6761
=> CreateNode(accessRule: accessRule, plugins: Array.Empty<IPlugin>());
6862

69-
private static TestLocalNode CreateNode(IReadOnlyList<IPlugin> plugins)
63+
private static NodeBase CreateNode(IReadOnlyList<IPlugin> plugins)
7064
=> CreateNode(accessRule: null, plugins: plugins);
7165

72-
private static TestLocalNode CreateNode(IAccessRule? accessRule, IReadOnlyList<IPlugin> plugins)
73-
=> new(accessRule, plugins);
66+
private static NodeBase CreateNode(IAccessRule? accessRule, IReadOnlyList<IPlugin> plugins)
67+
=> new TestLocalNode(accessRule, plugins);
7468

7569
private static TcpClient CreateClient(
7670
IPEndPoint endPoint,
@@ -128,7 +122,7 @@ Func<NodeBase, TcpClient, StreamWriter, StreamReader, CancellationToken, Task> a
128122
cts.Token
129123
);
130124

131-
using var client = CreateClient(node.LocalEndPointToConnect, out var writer, out var reader);
125+
using var client = CreateClient((IPEndPoint)node.LocalEndPoint, out var writer, out var reader);
132126

133127
try {
134128
reader.ReadLine(); // banner
@@ -163,7 +157,7 @@ public async Task AcceptSingleSessionAsync()
163157

164158
var taskAccept = Task.Run(async () => await node.AcceptSingleSessionAsync());
165159

166-
using var client = CreateClient(node.LocalEndPointToConnect, out var writer, out var reader);
160+
using var client = CreateClient((IPEndPoint)node.LocalEndPoint, out var writer, out var reader);
167161

168162
var banner = reader.ReadLine();
169163

@@ -208,7 +202,7 @@ public async Task AcceptSingleSessionAsync_ClientDisconnected_BeforeSendingBanne
208202

209203
var taskAccept = Task.Run(async () => await node.AcceptSingleSessionAsync());
210204

211-
using var client = CreateClient(node.LocalEndPointToConnect, out _, out _);
205+
using var client = CreateClient((IPEndPoint)node.LocalEndPoint, out _, out _);
212206

213207
client.Close();
214208

@@ -224,7 +218,7 @@ public async Task AcceptSingleSessionAsync_ClientDisconnected_WhileAwaitingComma
224218

225219
var taskAccept = Task.Run(async () => await node.AcceptSingleSessionAsync());
226220

227-
using var client = CreateClient(node.LocalEndPointToConnect, out _, out var reader);
221+
using var client = CreateClient((IPEndPoint)node.LocalEndPoint, out _, out var reader);
228222

229223
reader.ReadLine(); // read banner
230224

@@ -341,7 +335,7 @@ public async Task AcceptSingleSessionAsync_INodeSessionCallback(bool setSessionC
341335
Assert.That(plugin.StartedSessionIds.Count, Is.EqualTo(0), nameof(plugin.StartedSessionIds));
342336
Assert.That(plugin.ClosedSessionIds.Count, Is.EqualTo(0), nameof(plugin.ClosedSessionIds));
343337

344-
using var client = CreateClient(node.LocalEndPointToConnect, out var writer, out var reader);
338+
using var client = CreateClient((IPEndPoint)node.LocalEndPoint, out var writer, out var reader);
345339

346340
var banner = reader.ReadLine();
347341

@@ -389,15 +383,15 @@ public async Task AcceptAsync(bool throwIfCancellationRequested)
389383

390384
var taskAccept = Task.Run(async () => await node.AcceptAsync(throwIfCancellationRequested, cts.Token));
391385

392-
using var client0 = CreateClient(node.LocalEndPointToConnect, out var writer0, out var reader0);
386+
using var client0 = CreateClient((IPEndPoint)node.LocalEndPoint, out var writer0, out var reader0);
393387

394388
reader0.ReadLine();
395389
writer0.WriteLine(".");
396390
writer0.Close();
397391

398392
Assert.That(taskAccept.Wait(TimeSpan.FromSeconds(1.0)), Is.False, "task must not be completed");
399393

400-
using var client1 = CreateClient(node.LocalEndPointToConnect, out var writer1, out var reader1);
394+
using var client1 = CreateClient((IPEndPoint)node.LocalEndPoint, out var writer1, out var reader1);
401395

402396
reader1.ReadLine();
403397
writer1.WriteLine(".");
@@ -423,7 +417,7 @@ public async Task ProcessCommandAsync_EndOfLine(string eol)
423417

424418
var taskAccept = Task.Run(async () => await node.AcceptSingleSessionAsync());
425419

426-
using var client = CreateClient(node.LocalEndPointToConnect, out var writer, out _);
420+
using var client = CreateClient((IPEndPoint)node.LocalEndPoint, out var writer, out _);
427421

428422
writer.Write(".");
429423
writer.Write(eol);

0 commit comments

Comments
 (0)