Skip to content

Commit bf623c0

Browse files
committed
Removing delay, only using secondRequestReceived, adding default timeouts and using testUri
1 parent 8df74b9 commit bf623c0

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

src/SignalR/clients/csharp/Client/test/UnitTests/LongPollingTransportTests.cs

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,6 @@ public async Task PollRequestsContainCorrectAcceptHeader()
702702
var responseTaskCompletionSource = new TaskCompletionSource<HttpResponseMessage>();
703703
var requestCount = 0;
704704
var allHeadersCorrect = true;
705-
var firstRequestReceived = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
706705
var secondRequestReceived = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
707706

708707
testHttpHandler.OnRequest(async (request, next, cancellationToken) =>
@@ -714,11 +713,7 @@ public async Task PollRequestsContainCorrectAcceptHeader()
714713

715714
requestCount++;
716715

717-
if (requestCount == 1)
718-
{
719-
firstRequestReceived.SetResult();
720-
}
721-
else if (requestCount == 2)
716+
if (requestCount == 2)
722717
{
723718
secondRequestReceived.SetResult();
724719
}
@@ -743,28 +738,15 @@ public async Task PollRequestsContainCorrectAcceptHeader()
743738
var loggerFactory = NullLoggerFactory.Instance;
744739
var transport = new LongPollingTransport(httpClient, loggerFactory: loggerFactory);
745740

746-
var cts = new CancellationTokenSource();
747-
var startTask = transport.StartAsync(new Uri("http://test.com"), TransferFormat.Text, cts.Token);
748-
749-
await firstRequestReceived.Task;
750-
751-
await Task.Delay(100);
752-
753-
cts.Cancel();
741+
var startTask = transport.StartAsync(TestUri, TransferFormat.Text);
754742

755-
await secondRequestReceived.Task;
743+
await secondRequestReceived.Task.DefaultTimeout();
756744

757745
await transport.StopAsync();
758746

759-
if (!responseTaskCompletionSource.Task.IsCompleted)
760-
{
761-
responseTaskCompletionSource.TrySetResult(new HttpResponseMessage(HttpStatusCode.BadRequest));
762-
}
763-
764747
Assert.True(responseTaskCompletionSource.Task.IsCompleted);
765748
var response = await responseTaskCompletionSource.Task.DefaultTimeout();
766749
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
767750
}
768751
}
769-
770752
}

0 commit comments

Comments
 (0)