test fixes

Geoffrey Kizer · Geoffrey Kizer · commit a9c3ff523b69 · 2021-07-13T11:14:49.000-07:00
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs
@@ -129,7 +129,7 @@ public async Task Http2_DataSentBeforeServerPreface_ProtocolError()
                 DataFrame invalidFrame = new DataFrame(new byte[10], FrameFlags.Padded, 10, 1);
                 await connection.WriteFrameAsync(invalidFrame);
 
-                await AssertProtocolErrorAsync(sendTask, ProtocolErrors.PROTOCOL_ERROR);
+                await Assert.ThrowsAsync<HttpRequestException>(() => sendTask);
             }
         }
 
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.Cancellation.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.Cancellation.cs
@@ -84,6 +84,12 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
         [InlineData(false)]
         public async Task ConnectTimeout_PlaintextStreamFilterTimesOut_Throws(bool useSsl)
         {
+            if (UseVersion == HttpVersion.Version30)
+            {
+                // HTTP3 does not support PlaintextStreamFilter
+                return;
+            }
+
             var releaseServer = new TaskCompletionSource();
             await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
             {

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public async Task Http2_DataSentBeforeServerPreface_ProtocolError()`
`129`	`129`	`DataFrame invalidFrame = new DataFrame(new byte[10], FrameFlags.Padded, 10, 1);`
`130`	`130`	`await connection.WriteFrameAsync(invalidFrame);`
`131`	`131`
`132`		`- await AssertProtocolErrorAsync(sendTask, ProtocolErrors.PROTOCOL_ERROR);`
	`132`	`+ await Assert.ThrowsAsync<HttpRequestException>(() => sendTask);`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,12 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>`
`84`	`84`	`[InlineData(false)]`
`85`	`85`	`public async Task ConnectTimeout_PlaintextStreamFilterTimesOut_Throws(bool useSsl)`
`86`	`86`	`{`
	`87`	`+ if (UseVersion == HttpVersion.Version30)`
	`88`	`+ {`
	`89`	`+ // HTTP3 does not support PlaintextStreamFilter`
	`90`	`+ return;`
	`91`	`+ }`
	`92`	`+`
`87`	`93`	`var releaseServer = new TaskCompletionSource();`
`88`	`94`	`await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>`
`89`	`95`	`{`