Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[tests] Add tests for more Playground apps #5294

Merged
merged 5 commits into from
Aug 15, 2024
Merged

[tests] Add tests for more Playground apps #5294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29eead1
Skip RedisCommander when building for tests
radical Aug 14, 2024
d715ace
[tests] Add MilvusPlayground
radical Aug 14, 2024
1513575
[tests] playground: don't log trace level messages, too verbose
radical Aug 14, 2024
1a55152
Fix local builds
radical Aug 15, 2024
241cd7e
Revert "Fix local builds"
radical Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions playground/TestShop/TestShop.AppHost/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
.AddDatabase("catalogdb");

var basketCache = builder.AddRedis("basketcache")
.WithDataVolume()
.WithRedisCommander(c =>
{
c.WithHostPort(33801);
});
.WithDataVolume();

#if !SKIP_DASHBOARD_REFERENCE
basketCache.WithRedisCommander(c =>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indent

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file has top-level statements, so zero indent. Or did you mean for the {..} block? Could you share the suggested indent in that case, and I can commit that?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can change in a follow up.

{
c.WithHostPort(33801);
});
#endif

var catalogService = builder.AddProject<Projects.CatalogService>("catalogservice")
.WithReference(catalogDb)
Expand Down
2 changes: 2 additions & 0 deletions tests/Aspire.Playground.Tests/AppHostTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ public static TheoryData<TestEndpoints> TestEndpoints()
{
IList<TestEndpoints> candidates =
[
new TestEndpoints("MilvusPlayground.AppHost",
resourceEndpoints: new() { { "apiservice", ["/alive", "/health", "/create", "/search"] } }),
new TestEndpoints("CosmosEndToEnd.AppHost",
resourceEndpoints: new() { { "api", ["/alive", "/health", "/", "/ef"] } },
waitForTexts: [
Expand Down
1 change: 1 addition & 0 deletions tests/Aspire.Playground.Tests/Aspire.Playground.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<ProjectReference Include="$(PlaygroundSourceDir)SqlServerEndToEnd/SqlServerEndToEnd.AppHost/SqlServerEndToEnd.AppHost.csproj" />
<ProjectReference Include="$(PlaygroundSourceDir)TestShop/TestShop.AppHost/TestShop.AppHost.csproj" />
<ProjectReference Include="$(PlaygroundSourceDir)keycloak/Keycloak.AppHost/Keycloak.AppHost.csproj" />
<ProjectReference Include="$(PlaygroundSourceDir)milvus/MilvusPlayground.AppHost/MilvusPlayground.AppHost.csproj" />

<!-- Issue: https://github.com/dotnet/aspire/issues/5274 -->
<!--<ProjectReference Include="$(PlaygroundSourceDir)mongo/Mongo.AppHost/Mongo.AppHost.csproj" />-->
Expand Down
6 changes: 3 additions & 3 deletions tests/Aspire.Playground.Tests/Infrastructure/DistributedApplicationTestFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ public static async Task<IDistributedApplicationTestingBuilder> CreateAsync(stri
{
logging.AddXunit(testOutput);
}
logging.SetMinimumLevel(LogLevel.Trace);
logging.AddFilter("Aspire", LogLevel.Trace);
logging.AddFilter(builder.Environment.ApplicationName, LogLevel.Trace);
logging.SetMinimumLevel(LogLevel.Debug);
logging.AddFilter("Aspire", LogLevel.Debug);
logging.AddFilter(builder.Environment.ApplicationName, LogLevel.Debug);
});

return builder;
Expand Down