Skip to content

Commit 8199f66

Browse files
JamesNKJamesNK
authored
Fix HTTP/3 test errors on .NET 6 (#2423)
1 parent 2d9df58 commit 8199f66

11 files changed

+29
-29
lines changed

‎test/FunctionalTests/Client/ClientFactoryTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region Copyright notice and license
1+
#region Copyright notice and license
22

33
// Copyright 2019 The gRPC Authors
44
//
@@ -81,7 +81,7 @@ Task<HelloReply> UnaryCall(HelloRequest request, ServerCallContext context)
8181
Assert.AreEqual("Hello world", response2.Message);
8282
}
8383

84-
#if NET6_0_OR_GREATER
84+
#if NET7_0_OR_GREATER
8585
[Test]
8686
[RequireHttp3]
8787
public async Task ClientFactory_Http3_Success()

‎test/FunctionalTests/Client/ConnectionTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Task<HelloReply> UnaryUds(HelloRequest request, ServerCallContext context)
9898
}
9999
#endif
100100

101-
#if NET6_0_OR_GREATER
101+
#if NET7_0_OR_GREATER
102102
[Test]
103103
[RequireHttp3]
104104
public async Task Http3()

‎test/FunctionalTests/Web/Client/AuthTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
2828

2929
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
3030
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
31-
#if NET6_0_OR_GREATER
31+
#if NET7_0_OR_GREATER
3232
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
3333
#endif
3434
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
3535
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
36-
#if NET6_0_OR_GREATER
36+
#if NET7_0_OR_GREATER
3737
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
3838
#endif
3939
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
40-
#if NET6_0_OR_GREATER
40+
#if NET7_0_OR_GREATER
4141
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
4242
#endif
4343
public class AuthTests : GrpcWebFunctionalTestBase

‎test/FunctionalTests/Web/Client/ClientFactoryTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
2828

2929
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
3030
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
31-
#if NET6_0_OR_GREATER
31+
#if NET7_0_OR_GREATER
3232
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
3333
#endif
3434
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
3535
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
36-
#if NET6_0_OR_GREATER
36+
#if NET7_0_OR_GREATER
3737
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
3838
#endif
3939
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
40-
#if NET6_0_OR_GREATER
40+
#if NET7_0_OR_GREATER
4141
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
4242
#endif
4343
public class ClientFactoryTests : GrpcWebFunctionalTestBase

‎test/FunctionalTests/Web/Client/ConnectionTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private GrpcChannel CreateGrpcWebChannel(TestServerEndpointName endpointName, Ve
7272
[TestCase(TestServerEndpointName.Http2WithTls, "1.1", false)]
7373
#endif
7474
[TestCase(TestServerEndpointName.Http2WithTls, null, true)]
75-
#if NET6_0_OR_GREATER
75+
#if NET7_0_OR_GREATER
7676
[TestCase(TestServerEndpointName.Http3WithTls, null, true)]
7777
#endif
7878
public async Task SendValidRequest_WithConnectionOptions(TestServerEndpointName endpointName, string? version, bool success)

‎test/FunctionalTests/Web/Client/IssueTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
2727

2828
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
2929
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
30-
#if NET6_0_OR_GREATER
30+
#if NET7_0_OR_GREATER
3131
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
3232
#endif
3333
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
3434
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
35-
#if NET6_0_OR_GREATER
35+
#if NET7_0_OR_GREATER
3636
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
3737
#endif
3838
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
39-
#if NET6_0_OR_GREATER
39+
#if NET7_0_OR_GREATER
4040
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
4141
#endif
4242
public class IssueTests : GrpcWebFunctionalTestBase

‎test/FunctionalTests/Web/Client/ServerStreamingMethodTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
2929

3030
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
3131
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
32-
#if NET6_0_OR_GREATER
32+
#if NET7_0_OR_GREATER
3333
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
3434
#endif
3535
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
3636
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
37-
#if NET6_0_OR_GREATER
37+
#if NET7_0_OR_GREATER
3838
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
3939
#endif
4040
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
41-
#if NET6_0_OR_GREATER
41+
#if NET7_0_OR_GREATER
4242
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
4343
#endif
4444
public class ServerStreamingMethodTests : GrpcWebFunctionalTestBase

‎test/FunctionalTests/Web/Client/TrailerMetadataTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region Copyright notice and license
1+
#region Copyright notice and license
22

33
// Copyright 2019 The gRPC Authors
44
//
@@ -26,16 +26,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
2626

2727
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
2828
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
29-
#if NET6_0_OR_GREATER
29+
#if NET7_0_OR_GREATER
3030
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
3131
#endif
3232
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
3333
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
34-
#if NET6_0_OR_GREATER
34+
#if NET7_0_OR_GREATER
3535
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
3636
#endif
3737
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
38-
#if NET6_0_OR_GREATER
38+
#if NET7_0_OR_GREATER
3939
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
4040
#endif
4141
public class TrailerMetadataTests : GrpcWebFunctionalTestBase

‎test/FunctionalTests/Web/Client/UnaryMethodTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Client;
2626

2727
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
2828
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
29-
#if NET6_0_OR_GREATER
29+
#if NET7_0_OR_GREATER
3030
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
3131
#endif
3232
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
3333
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
34-
#if NET6_0_OR_GREATER
34+
#if NET7_0_OR_GREATER
3535
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
3636
#endif
3737
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
38-
#if NET6_0_OR_GREATER
38+
#if NET7_0_OR_GREATER
3939
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
4040
#endif
4141
public class UnaryMethodTests : GrpcWebFunctionalTestBase

‎test/FunctionalTests/Web/Server/DeadlineTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Server;
2828

2929
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
3030
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
31-
#if NET6_0_OR_GREATER
31+
#if NET7_0_OR_GREATER
3232
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
3333
#endif
3434
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
3535
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
36-
#if NET6_0_OR_GREATER
36+
#if NET7_0_OR_GREATER
3737
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
3838
#endif
3939
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
40-
#if NET6_0_OR_GREATER
40+
#if NET7_0_OR_GREATER
4141
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
4242
#endif
4343
public class DeadlineTests : GrpcWebFunctionalTestBase

‎test/FunctionalTests/Web/Server/UnaryMethodTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ namespace Grpc.AspNetCore.FunctionalTests.Web.Server;
2727

2828
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http1)]
2929
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http2)]
30-
#if NET6_0_OR_GREATER
30+
#if NET7_0_OR_GREATER
3131
[TestFixture(GrpcTestMode.GrpcWeb, TestServerEndpointName.Http3WithTls)]
3232
#endif
3333
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http1)]
3434
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http2)]
35-
#if NET6_0_OR_GREATER
35+
#if NET7_0_OR_GREATER
3636
[TestFixture(GrpcTestMode.GrpcWebText, TestServerEndpointName.Http3WithTls)]
3737
#endif
3838
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http2)]
39-
#if NET6_0_OR_GREATER
39+
#if NET7_0_OR_GREATER
4040
[TestFixture(GrpcTestMode.Grpc, TestServerEndpointName.Http3WithTls)]
4141
#endif
4242
public class UnaryMethodTests : GrpcWebFunctionalTestBase

0 commit comments

Comments
 (0)