CLAUDE.md "Docker Workflow" claims (per the 2026-04-28 migration note)
that all fixture-class default endpoints were rewritten to target the
shared Docker host at 10.100.0.35. Audit during today's e2e run showed
the claim was incomplete — five fixture classes still defaulted to
localhost / 127.0.0.1, causing every fixture-touching integration test
to skip with "endpoint unreachable" on a fresh box that hadn't set
the override env vars.
Files corrected:
- tests/.../Modbus.IntegrationTests/ModbusSimulatorFixture.cs
DefaultEndpoint: localhost:5020 → 10.100.0.35:5020
- tests/.../S7.IntegrationTests/Snap7ServerFixture.cs
DefaultEndpoint: localhost:1102 → 10.100.0.35:1102
- tests/.../OpcUaClient.IntegrationTests/OpcPlcFixture.cs
DefaultEndpoint: opc.tcp://localhost:50000 → opc.tcp://10.100.0.35:50000
- tests/.../AbCip.IntegrationTests/AbServerFixture.cs
Host default + ResolveHost fallback: 127.0.0.1 → 10.100.0.35
- tests/.../AbLegacy.IntegrationTests/AbLegacyServerFixture.cs
Host default + ResolveEndpoint fallback: 127.0.0.1 → 10.100.0.35
XML doc comments referencing the old localhost defaults were updated in
the same pass so the class-summary documentation matches the actual
default. The override-via-env-var mechanism (MODBUS_SIM_ENDPOINT,
AB_SERVER_ENDPOINT, AB_LEGACY_ENDPOINT, S7_SIM_ENDPOINT,
OPCUA_SIM_ENDPOINT) is unchanged — pointing at a real PLC or a
locally-running container still works exactly as before.
Verification:
- Solution-wide dotnet build: 0 errors.
- S7.IntegrationTests: 3/3 pass without env-var override.
- OpcUaClient.IntegrationTests: 3/3 pass without env-var override.
- Modbus.IntegrationTests: 4/38 (same as the env-var-override run —
the 2 failures + 32 skips are pre-existing fixture-profile
mismatches unrelated to this fix).
- AbCip.IntegrationTests / AbLegacy.IntegrationTests: same results
as the env-var-override run.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
86 lines
4.0 KiB
C#
86 lines
4.0 KiB
C#
using System.Net.Sockets;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests;
|
|
|
|
/// <summary>
|
|
/// Reachability probe for the python-snap7 simulator Docker container (see
|
|
/// <c>Docker/docker-compose.yml</c>) or a real S7 PLC. Parses <c>S7_SIM_ENDPOINT</c>
|
|
/// (default <c>10.100.0.35:1102</c> — the shared Docker host) + TCP-connects once at fixture construction.
|
|
/// Tests check <see cref="SkipReason"/> + call <c>Assert.Skip</c> when unreachable, so
|
|
/// `dotnet test` stays green on a fresh box without the simulator installed —
|
|
/// mirrors the <c>ModbusSimulatorFixture</c> pattern.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>
|
|
/// Default port is <b>1102</b>, not the S7-standard 102. 102 is a privileged port
|
|
/// on Linux (needs root) + triggers the Windows Firewall prompt on first bind;
|
|
/// 1102 sidesteps both. S7netplus 0.20 supports the 5-arg <c>Plc</c> ctor that
|
|
/// takes an explicit port (verified + wired through <c>S7DriverOptions.Port</c>),
|
|
/// so the driver can reach the simulator on its non-standard port without
|
|
/// hacks.
|
|
/// </para>
|
|
/// <para>
|
|
/// The probe is a one-shot liveness check; tests open their own S7netplus
|
|
/// sessions against the same endpoint. Don't share a socket — S7 CPUs serialise
|
|
/// concurrent connections against the same mailbox anyway, but sharing would
|
|
/// couple test ordering to socket reuse in ways this harness shouldn't care
|
|
/// about.
|
|
/// </para>
|
|
/// <para>
|
|
/// Fixture is a collection fixture so the probe runs once per test session, not
|
|
/// per test.
|
|
/// </para>
|
|
/// </remarks>
|
|
public sealed class Snap7ServerFixture : IAsyncDisposable
|
|
{
|
|
// Default 1102 (non-privileged) matches Docker/server.py. Override with
|
|
// S7_SIM_ENDPOINT to point at a real PLC on its native 102.
|
|
// 10.100.0.35 = the shared Docker host (see CLAUDE.md "Docker Workflow"). Migrated
|
|
// off this VM's localhost on 2026-04-28 alongside the rest of the Docker-host move.
|
|
private const string DefaultEndpoint = "10.100.0.35:1102";
|
|
private const string EndpointEnvVar = "S7_SIM_ENDPOINT";
|
|
|
|
public string Host { get; }
|
|
public int Port { get; }
|
|
public string? SkipReason { get; }
|
|
|
|
public Snap7ServerFixture()
|
|
{
|
|
var raw = Environment.GetEnvironmentVariable(EndpointEnvVar) ?? DefaultEndpoint;
|
|
var parts = raw.Split(':', 2);
|
|
Host = parts[0];
|
|
Port = parts.Length == 2 && int.TryParse(parts[1], out var p) ? p : 102;
|
|
|
|
try
|
|
{
|
|
// Force IPv4 — python-snap7 binds 0.0.0.0 (IPv4) and .NET's default
|
|
// dual-stack "localhost" resolves IPv6 ::1 first then times out before
|
|
// falling back. Same story the Modbus fixture hits.
|
|
using var client = new TcpClient(AddressFamily.InterNetwork);
|
|
var task = client.ConnectAsync(
|
|
System.Net.Dns.GetHostAddresses(Host)
|
|
.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork)
|
|
?? System.Net.IPAddress.Loopback,
|
|
Port);
|
|
if (!task.Wait(TimeSpan.FromSeconds(2)) || !client.Connected)
|
|
{
|
|
SkipReason = $"python-snap7 simulator at {Host}:{Port} did not accept a TCP connection within 2s. " +
|
|
$"Start it (docker compose -f Docker/docker-compose.yml --profile s7_1500 up -d) or override {EndpointEnvVar}.";
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
SkipReason = $"python-snap7 simulator at {Host}:{Port} unreachable: {ex.GetType().Name}: {ex.Message}. " +
|
|
$"Start it (docker compose -f Docker/docker-compose.yml --profile s7_1500 up -d) or override {EndpointEnvVar}.";
|
|
}
|
|
}
|
|
|
|
public ValueTask DisposeAsync() => ValueTask.CompletedTask;
|
|
}
|
|
|
|
[Xunit.CollectionDefinition(Name)]
|
|
public sealed class Snap7ServerCollection : Xunit.ICollectionFixture<Snap7ServerFixture>
|
|
{
|
|
public const string Name = "Snap7Server";
|
|
}
|