Skip to content
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

Jump to bottom

Fix intermittent errors during build and in VS Test Explorer #430

Merged
merged 1 commit into from
Jan 19, 2024
Merged

Fix intermittent errors during build and in VS Test Explorer #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ...tions.DemoFunction.InProcess/Corvus.Testing.AzureFunctions.DemoFunctions.InProcess.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

<PropertyGroup>
<IsTestProject>false</IsTestProject>
<TestProject>false</TestProject>
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions ...ctions.DemoFunctions.Isolated/Corvus.Testing.AzureFunctions.DemoFunctions.Isolated.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<PropertyGroup>
<IsTestProject>false</IsTestProject>
<TestProject>false</TestProject>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 5 additions & 0 deletions ...Testing.AzureFunctions.SpecFlow.NUnit/Corvus.Testing.AzureFunctions.SpecFlow.NUnit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@

<PropertyGroup>
<IsTestProject>false</IsTestProject>
<TestProject>false</TestProject>
</PropertyGroup>
<ItemGroup>
<!-- This project takes depedency on nUnit that adds the TestContainer capability importing NUnit.props, but this is not a test project -->
<ProjectCapability Remove="TestContainer" />
</ItemGroup>

<PropertyGroup>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
Expand Down
5 changes: 5 additions & 0 deletions ...ions/Corvus.Testing.AzureFunctions.SpecFlow/Corvus.Testing.AzureFunctions.SpecFlow.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@

<PropertyGroup>
<IsTestProject>false</IsTestProject>
<TestProject>false</TestProject>
</PropertyGroup>
<ItemGroup>
<!-- This project takes depedency on nUnit that adds the TestContainer capability importing NUnit.props, but this is not a test project -->
<ProjectCapability Remove="TestContainer" />
</ItemGroup>

<PropertyGroup>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
Expand Down
2 changes: 1 addition & 1 deletion Solutions/Corvus.Testing.AzureFunctions.Xunit.Demo/FunctionPerTestFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public FunctionPerTestFacts(ITestOutputHelper output)
.CreateLogger("Xunit Demo tests");

this.function = new FunctionsController(logger);
this.Port = new Random().Next(50000, 60000);
this.Port = this.function.FindAvailableTcpPort(50000, 60000);
}

public int Port { get; }
Expand Down
1 change: 1 addition & 0 deletions Solutions/Corvus.Testing.AzureFunctions/Corvus.Testing.AzureFunctions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

<PropertyGroup>
<IsTestProject>false</IsTestProject>
<TestProject>false</TestProject>
</PropertyGroup>

<PropertyGroup>
Expand Down
28 changes: 28 additions & 0 deletions Solutions/Corvus.Testing.AzureFunctions/Corvus/Testing/AzureFunctions/FunctionsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,34 @@ await Task.WhenAny(
this.logger.LogInformation("Function {Path} now running on port {Port}", path, port);
}

/// <summary>
/// Randomly selects a port that appears to be available for use.
/// </summary>
/// <param name="lowerBoundInclusive">
/// The lowest port number acceptable. Defaults to 50000.
/// </param>
/// <param name="upperBoundExclusive">
/// The port number above which no port will be selected. Defaults to 60000.
/// </param>
/// <returns>A port number that seems to be available.</returns>
public int FindAvailableTcpPort(int? lowerBoundInclusive, int? upperBoundExclusive)
{
int lb = lowerBoundInclusive ?? 50000;
int ub = upperBoundExclusive ?? 60000;

var portsInRangeInUse = IPGlobalProperties
.GetIPGlobalProperties()
.GetActiveTcpListeners()
.Select(e => e.Port)
.Where(p => p >= lb && p < ub)
.ToHashSet();

int availablePorts = ub - lb - portsInRangeInUse.Count;
int availablePortOffset = Random.Shared.Next(availablePorts);
int port = Enumerable.Range(lb, ub - lb).Where(p => !portsInRangeInUse.Contains(p)).ElementAt(availablePortOffset);
return port;
}

/// <summary>
/// Provides access to the output.
/// </summary>
Expand Down
5 changes: 5 additions & 0 deletions Solutions/Corvus.Testing.SpecFlow.NUnit/Corvus.Testing.SpecFlow.NUnit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@

<PropertyGroup>
<IsTestProject>false</IsTestProject>
<TestProject>false</TestProject>
</PropertyGroup>
<ItemGroup>
<!-- This project takes depedency on nUnit that adds the TestContainer capability importing NUnit.props, but this is not a test project -->
<ProjectCapability Remove="TestContainer" />
</ItemGroup>

<PropertyGroup>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
Expand Down
5 changes: 5 additions & 0 deletions Solutions/Corvus.Testing.SpecFlow/Corvus.Testing.SpecFlow.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@

<PropertyGroup>
<IsTestProject>false</IsTestProject>
<TestProject>false</TestProject>
</PropertyGroup>
<ItemGroup>
<!-- This project takes depedency on nUnit that adds the TestContainer capability importing NUnit.props, but this is not a test project -->
<ProjectCapability Remove="TestContainer" />
</ItemGroup>

<PropertyGroup>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
Expand Down
Loading