Skip to content

Fix race condition in ObserveUnauthorizedPollingConnections test #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhysparry merged 2 commits into from
May 8, 2026
Merged

Fix race condition in ObserveUnauthorizedPollingConnections test #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c2f7f8
Fix race condition in ObserveUnauthorizedPollingConnections test
rhysparry May 5, 2026
7e679d9
merge main
rhysparry May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions source/Halibut.Tests/Support/LatestClientAndLatestServiceBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,12 @@ public LatestClientAndLatestServiceBuilder WithClientTrustingTheWrongCertificate
return this;
}

public LatestClientAndLatestServiceBuilder WithClientTrustingNoThumbprints()
{
clientBuilder.WithClientTrustingNoThumbprints();
return this;
}

public LatestClientAndLatestServiceBuilder WithServiceTrustingTheWrongCertificate()
{
serviceBuilder.WithServiceTrustingTheWrongCertificate();
Expand Down
14 changes: 12 additions & 2 deletions source/Halibut.Tests/Support/LatestClientBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ public class LatestClientBuilder : IClientBuilder
CertAndThumbprint clientCertAndThumbprint;
readonly PollingQueueTestCase? pollingQueueTestCase;

string clientTrustsThumbprint;
string clientTrustsThumbprint;
bool clientTrustsNoThumbprints;
IRpcObserver? clientRpcObserver;
Func<int, PortForwarder>? portForwarderFactory;
Reference<PortForwarder>? portForwarderReference;
Expand Down Expand Up @@ -181,6 +182,12 @@ public LatestClientBuilder WithClientTrustingTheWrongCertificate()
clientTrustsThumbprint = CertAndThumbprint.Wrong.Thumbprint;
return this;
}

public LatestClientBuilder WithClientTrustingNoThumbprints()
{
clientTrustsNoThumbprints = true;
return this;
}

public LatestClientBuilder WithClientRpcObserver(IRpcObserver? clientRpcObserver)
{
Expand Down Expand Up @@ -215,7 +222,10 @@ public async Task<LatestClient> Build(CancellationToken cancellationToken)
}

var client = clientBuilder.Build();
client.Trust(clientTrustsThumbprint);
if (!clientTrustsNoThumbprints)
{
client.Trust(clientTrustsThumbprint);
}

var disposableCollection = new DisposableCollection();
PortForwarder? portForwarder = null;
Expand Down
3 changes: 1 addition & 2 deletions source/Halibut.Tests/Transport/Observability/ConnectionObserverFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using FluentAssertions;
Expand Down Expand Up @@ -83,10 +82,10 @@ public async Task ObserveUnauthorizedPollingConnections(ClientAndServiceTestCase
await using (var clientAndBuilder = await clientAndServiceTestCase.CreateTestCaseBuilder()
.WithStandardServices()
.AsLatestClientAndLatestServiceBuilder()
.WithClientTrustingNoThumbprints()
.WithConnectionObserverOnTcpServer(connectionsObserver)
.Build(CancellationToken))
{
clientAndBuilder.Client.TrustOnly(new List<string>());

using var cts = new CancellationTokenSource();
var token = cts.Token;
Expand Down