@@ -19,13 +19,10 @@ public async Task AppHostRunsCleanly(string appHostPath)
1919 var appHost = await DistributedApplicationTestFactory . CreateAsync ( appHostPath , testOutput ) ;
2020 await using var app = await appHost . BuildAsync ( ) ;
2121
22- var appHostLogs = app . GetAppHostLogs ( ) ;
23- var resourceLogs = app . GetResourceLogs ( ) ;
22+ await app . StartAsync ( ) ;
23+ await app . WaitForResources ( ) . WaitAsync ( TimeSpan . FromSeconds ( 30 ) ) ;
2424
25- await app . StartAsync ( waitForResourcesToStart : true ) ;
26-
27- EnsureNoErrors ( appHostLogs , appHostPath ) ;
28- resourceLogs . EnsureNoErrors ( ShouldAssertErrorsForResource ) ;
25+ app . EnsureNoErrorsLogged ( ) ;
2926
3027 await app . StopAsync ( ) ;
3128 }
@@ -42,18 +39,16 @@ public async Task TestEndpointsReturnOk(TestEndpoints testEndpoints)
4239 var projects = appHost . Resources . OfType < ProjectResource > ( ) ;
4340 await using var app = await appHost . BuildAsync ( ) ;
4441
45- var appHostLogs = app . GetAppHostLogs ( ) ;
46- var resourceLogs = app . GetResourceLogs ( ) ;
47-
48- await app . StartAsync ( waitForResourcesToStart : true ) ;
42+ await app . StartAsync ( ) ;
43+ await app . WaitForResources ( ) . WaitAsync ( TimeSpan . FromSeconds ( 30 ) ) ;
4944
5045 if ( testEndpoints . WaitForResources ? . Count > 0 )
5146 {
5247 // Wait until each resource transitions to the required state
5348 var timeout = TimeSpan . FromMinutes ( 5 ) ;
5449 foreach ( var ( ResourceName , TargetState ) in testEndpoints . WaitForResources )
5550 {
56- await app . WaitForResource ( ResourceName , TargetState , new CancellationTokenSource ( timeout ) . Token ) ;
51+ await app . WaitForResource ( ResourceName , TargetState ) . WaitAsync ( timeout ) ;
5752 }
5853 }
5954
@@ -75,10 +70,10 @@ public async Task TestEndpointsReturnOk(TestEndpoints testEndpoints)
7570 . ConfigureHttpClient ( client => client . Timeout = Timeout . InfiniteTimeSpan )
7671 . AddStandardResilienceHandler ( resilience =>
7772 {
78- resilience . TotalRequestTimeout . Timeout = TimeSpan . FromSeconds ( 300 ) ;
73+ resilience . TotalRequestTimeout . Timeout = TimeSpan . FromSeconds ( 120 ) ;
7974 resilience . AttemptTimeout . Timeout = TimeSpan . FromSeconds ( 60 ) ;
8075 resilience . Retry . MaxRetryAttempts = 30 ;
81- resilience . CircuitBreaker . SamplingDuration = TimeSpan . FromSeconds ( 300 ) ;
76+ resilience . CircuitBreaker . SamplingDuration = resilience . AttemptTimeout . Timeout * 2 ;
8277 } ) ;
8378 } ) ;
8479
@@ -105,37 +100,11 @@ public async Task TestEndpointsReturnOk(TestEndpoints testEndpoints)
105100 }
106101 }
107102
108- EnsureNoErrors ( appHostLogs , appHostPath ) ;
109- resourceLogs . EnsureNoErrors ( ShouldAssertErrorsForResource ) ;
103+ app . EnsureNoErrorsLogged ( ) ;
110104
111105 await app . StopAsync ( ) ;
112106 }
113107
114- private static bool ShouldAssertErrorsForResource ( IResource resource )
115- {
116- return resource
117- is
118- // Container resources tend to write to stderr for various reasons so only assert projects and executables
119- ( ProjectResource or ExecutableResource )
120- // Node resources tend to have npm modules that write to stderr so ignore them
121- and not NodeAppResource
122- // Dapr resources write to stderr about deprecated --components-path flag
123- && ! resource . Name . EndsWith ( "-dapr-cli" ) ;
124- }
125-
126- private static void EnsureNoErrors ( LoggerLogStore appHostLogs , string appHostPath )
127- {
128- var appHostName = Path . GetFileNameWithoutExtension ( appHostPath ) ;
129-
130- // Container resources tend to write to stderr for various reasons.
131- // Only assert errors for the app host and skip resources. Resources will be checked separately
132- // in the resourceLogs above.
133- // See also https://github.com/dotnet/aspire/issues/5094
134-
135- appHostLogs . EnsureNoErrors ( categoryName
136- => ! categoryName . StartsWith ( $ "{ appHostName } .Resources.", StringComparison . Ordinal ) ) ;
137- }
138-
139108 public static TheoryData < string > AppHostAssemblies ( )
140109 {
141110 var appHostAssemblies = GetSamplesAppHostAssemblyPaths ( ) ;
@@ -169,14 +138,17 @@ public static TheoryData<TestEndpoints> TestEndpoints() =>
169138 new TestEndpoints ( "ClientAppsIntegration.AppHost" , new ( ) {
170139 { "apiservice" , [ "/alive" , "/health" , "/weatherforecast" ] }
171140 } ) ,
141+ new TestEndpoints ( "ContainerBuild.AppHost" , new ( ) {
142+ { "ginapp" , [ "/" ] }
143+ } ) ,
172144 new TestEndpoints ( "DatabaseContainers.AppHost" , new ( ) {
173145 { "apiservice" , [ "/alive" , "/health" , "/todos" , "/todos/1" , "/catalog" , "/catalog/1" , "/addressbook" , "/addressbook/1" ] }
174146 } ) ,
175147 new TestEndpoints ( "DatabaseMigrations.AppHost" , new ( ) {
176148 { "api" , [ "/alive" , "/health" , "/" ] }
177149 } )
178150 {
179- WaitForResources = [ new ( "migration" , " Finished" ) ]
151+ WaitForResources = [ new ( "migration" , KnownResourceStates . Finished ) ]
180152 } ,
181153 new TestEndpoints ( "HealthChecksUI.AppHost" , new ( ) {
182154 { "apiservice" , [ "/alive" , "/health" , "/weatherforecast" ] } ,
0 commit comments