Skip to content

Refactoring tests to support both external and loopback servers #74579

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

Closed
greenEkatherine wants to merge 14 commits into from
Closed

Refactoring tests to support both external and loopback servers #74579

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3a5d90c
Refactoring tests to support both external and loopback servers
Aug 24, 2022
72620a4
Merge branch 'main' into ws-loopbackserver-tests
Sep 13, 2022
c69bed2
Refactor web socket tests to inherit different properties
Nov 21, 2022
c815cf6
fixing wasm tests
Nov 23, 2022
e913b46
Refactor server task handling
Nov 24, 2022
0953346
fixing WebSocketHelper for tests on browser
Nov 30, 2022
c077ccb
Apply suggestions from code review
Dec 6, 2022
53ff7c8
feedback
Dec 27, 2022
a5fedc0
Merge branch 'main' into ws-loopbackserver-tests
Dec 28, 2022
7491039
Removing accidentally left string from previous version
Jan 4, 2023
f27b764
Exclude Http2LoopbackConnection from tests for .NET Framework
Jan 4, 2023
ed279fe
Switch off Http2Stream for tests in net framework
Jan 5, 2023
fad549b
Apply suggestions from code review
Jan 25, 2023
18f1b1f
review feedback
Jan 26, 2023
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
Prev Previous commit
Next Next commit
fixing WebSocketHelper for tests on browser
  • Loading branch information
Katya Sokolova committed Dec 1, 2022
commit 09533467b8f65053ae01ef742654013240919779
9 changes: 5 additions & 4 deletions src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser</TargetFrameworks>
Expand Down Expand Up @@ -70,15 +70,16 @@
<Compile Include="LoopbackHelper.cs" />
<Compile Include="ResourceHelper.cs" />
<Compile Include="SendReceiveTest.cs" />
<Compile Include="SendReceiveTest.Http2.cs" Condition="'$(TargetsBrowser)' == 'false'" />
<Compile Include="SendReceiveTest.Http2.cs" />
<Compile Include="WebSocketData.cs" />
<Compile Include="WebSocketHelper.cs" />
<Compile Include="DeflateTests.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Net.TestData" Version="$(SystemNetTestDataVersion)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\System.Net.Http\ref\System.Net.Http.csproj" />
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Test" />
</ItemGroup>
</Project>
16 changes: 9 additions & 7 deletions src/libraries/System.Net.WebSockets.Client/tests/WebSocketHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,17 @@ public static Task<ClientWebSocket> GetConnectedWebSocket(
cws.Options.KeepAliveInterval = keepAliveInterval;
}

if (invoker == null)
if (!PlatformDetection.IsBrowser)
{
cws.Options.ClientCertificates.Add(Test.Common.Configuration.Certificates.GetClientCertificate());
cws.Options.RemoteCertificateValidationCallback = delegate { return true; };
if (invoker == null)
{
cws.Options.ClientCertificates.Add(Test.Common.Configuration.Certificates.GetClientCertificate());
cws.Options.RemoteCertificateValidationCallback = delegate { return true; };
}
cws.Options.HttpVersion = version;
cws.Options.HttpVersionPolicy = HttpVersionPolicy.RequestVersionExact;
}

cws.Options.HttpVersion = version;
cws.Options.HttpVersionPolicy = HttpVersionPolicy.RequestVersionExact;

using (var cts = new CancellationTokenSource(timeOutMilliseconds))
{
output.WriteLine("GetConnectedWebSocket: ConnectAsync starting.");
Expand All @@ -119,7 +121,7 @@ public static Task<ClientWebSocket> GetConnectedWebSocket(

public static async Task<T> Retry<T>(ITestOutputHelper output, Func<Task<T>> func)
{
const int MaxTries = 1;
const int MaxTries = 5;
int betweenTryDelayMilliseconds = 1000;

for (int i = 1; ; i++)
Expand Down