Skip to content

Commit ce4533d

Browse files
committed
Fix tests
1 parent 82ab14d commit ce4533d

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

tests/CommunityToolkit.Aspire.Hosting.Minio.Tests/MinioFunctionalTests.cs

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public async Task StorageGetsCreatedAndUsable()
1616
{
1717
using var distributedApplicationBuilder = TestDistributedApplicationBuilder.Create(testOutputHelper);
1818
var rootUser = "minioadmin";
19-
var port = 9000;
2019

2120
var passwordParameter = ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(distributedApplicationBuilder,
2221
$"rootPassword");
@@ -26,8 +25,9 @@ public async Task StorageGetsCreatedAndUsable()
2625
var minio = distributedApplicationBuilder
2726
.AddMinioContainer("minio",
2827
distributedApplicationBuilder.AddParameter("username", rootUser),
29-
rootPasswordParameter,
30-
port: port);
28+
rootPasswordParameter);
29+
30+
var minioEndpoint = minio.GetEndpoint("http");
3131

3232
await using var app = await distributedApplicationBuilder.BuildAsync();
3333

@@ -40,7 +40,7 @@ public async Task StorageGetsCreatedAndUsable()
4040
var webApplicationBuilder = Host.CreateApplicationBuilder();
4141

4242
webApplicationBuilder.Services.AddMinio(configureClient => configureClient
43-
.WithEndpoint("localhost", port)
43+
.WithEndpoint("localhost", minioEndpoint.Port)
4444
.WithCredentials(rootUser, passwordParameter.Value)
4545
.WithSSL(false)
4646
.Build());
@@ -67,31 +67,31 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
6767
using var builder1 = TestDistributedApplicationBuilder.Create(testOutputHelper);
6868

6969
var rootUser = "minioadmin";
70-
var port = 9000;
7170

7271
var passwordParameter = ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder1,
7372
$"rootPassword");
7473
builder1.Configuration["Parameters:rootPassword"] = passwordParameter.Value;
7574
var rootPasswordParameter = builder1.AddParameter(passwordParameter.Name);
7675

77-
var minio = builder1.AddMinioContainer("minio",
76+
var minio1 = builder1.AddMinioContainer("minio",
7877
builder1.AddParameter("username", rootUser),
79-
rootPasswordParameter,
80-
port: port);
78+
rootPasswordParameter);
79+
80+
var minio1Endpoint = minio1.GetEndpoint("http");
8181

8282
if (useVolume)
8383
{
8484
// Use a deterministic volume name to prevent them from exhausting the machines if deletion fails
85-
volumeName = VolumeNameGenerator.Generate(minio, nameof(WithDataShouldPersistStateBetweenUsages));
85+
volumeName = VolumeNameGenerator.Generate(minio1, nameof(WithDataShouldPersistStateBetweenUsages));
8686

8787
// if the volume already exists (because of a crashing previous run), delete it
8888
DockerUtils.AttemptDeleteDockerVolume(volumeName, throwOnFailure: true);
89-
minio.WithDataVolume(volumeName);
89+
minio1.WithDataVolume(volumeName);
9090
}
9191
else
9292
{
9393
bindMountPath = Directory.CreateTempSubdirectory().FullName;
94-
minio.WithDataBindMount(bindMountPath);
94+
minio1.WithDataBindMount(bindMountPath);
9595
}
9696

9797
using (var app = builder1.Build())
@@ -100,14 +100,14 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
100100

101101
var rns = app.Services.GetRequiredService<ResourceNotificationService>();
102102

103-
await rns.WaitForResourceHealthyAsync(minio.Resource.Name);
103+
await rns.WaitForResourceHealthyAsync(minio1.Resource.Name);
104104

105105
try
106106
{
107107
var webApplicationBuilder = Host.CreateApplicationBuilder();
108108

109109
webApplicationBuilder.Services.AddMinio(configureClient => configureClient
110-
.WithEndpoint("localhost", port)
110+
.WithEndpoint("localhost", minio1Endpoint.Port)
111111
.WithCredentials(rootUser, passwordParameter.Value)
112112
.WithSSL(false)
113113
.Build());
@@ -133,8 +133,9 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
133133

134134
var minio2 = builder2.AddMinioContainer("minio",
135135
builder2.AddParameter("username", rootUser),
136-
rootPasswordParameter2,
137-
port: port);
136+
rootPasswordParameter2);
137+
138+
var minio2Endpoint = minio2.GetEndpoint("http");
138139

139140
if (useVolume)
140141
{
@@ -151,15 +152,15 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
151152

152153
var rns = app.Services.GetRequiredService<ResourceNotificationService>();
153154

154-
await rns.WaitForResourceHealthyAsync(minio.Resource.Name);
155+
await rns.WaitForResourceHealthyAsync(minio1.Resource.Name);
155156

156157

157158
try
158159
{
159160
var webApplicationBuilder = Host.CreateApplicationBuilder();
160161

161162
webApplicationBuilder.Services.AddMinio(configureClient => configureClient
162-
.WithEndpoint("localhost", port)
163+
.WithEndpoint("localhost", minio2Endpoint.Port)
163164
.WithCredentials(rootUser, passwordParameter.Value)
164165
.WithSSL(false)
165166
.Build());

0 commit comments

Comments
 (0)