@@ -702,7 +702,6 @@ public async Task PollRequestsContainCorrectAcceptHeader()
702
702
var responseTaskCompletionSource = new TaskCompletionSource < HttpResponseMessage > ( ) ;
703
703
var requestCount = 0 ;
704
704
var allHeadersCorrect = true ;
705
- var firstRequestReceived = new TaskCompletionSource ( TaskCreationOptions . RunContinuationsAsynchronously ) ;
706
705
var secondRequestReceived = new TaskCompletionSource ( TaskCreationOptions . RunContinuationsAsynchronously ) ;
707
706
708
707
testHttpHandler . OnRequest ( async ( request , next , cancellationToken ) =>
@@ -714,11 +713,7 @@ public async Task PollRequestsContainCorrectAcceptHeader()
714
713
715
714
requestCount ++ ;
716
715
717
- if ( requestCount == 1 )
718
- {
719
- firstRequestReceived . SetResult ( ) ;
720
- }
721
- else if ( requestCount == 2 )
716
+ if ( requestCount == 2 )
722
717
{
723
718
secondRequestReceived . SetResult ( ) ;
724
719
}
@@ -743,28 +738,15 @@ public async Task PollRequestsContainCorrectAcceptHeader()
743
738
var loggerFactory = NullLoggerFactory . Instance ;
744
739
var transport = new LongPollingTransport ( httpClient , loggerFactory : loggerFactory ) ;
745
740
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 ) ;
754
742
755
- await secondRequestReceived . Task ;
743
+ await secondRequestReceived . Task . DefaultTimeout ( ) ;
756
744
757
745
await transport . StopAsync ( ) ;
758
746
759
- if ( ! responseTaskCompletionSource . Task . IsCompleted )
760
- {
761
- responseTaskCompletionSource . TrySetResult ( new HttpResponseMessage ( HttpStatusCode . BadRequest ) ) ;
762
- }
763
-
764
747
Assert . True ( responseTaskCompletionSource . Task . IsCompleted ) ;
765
748
var response = await responseTaskCompletionSource . Task . DefaultTimeout ( ) ;
766
749
Assert . Equal ( HttpStatusCode . OK , response . StatusCode ) ;
767
750
}
768
751
}
769
-
770
752
}
0 commit comments