Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion src/Testcontainers.Pulsar/PulsarBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,20 @@ public override PulsarContainer Build()
{
Validate();

var waitStrategy = Wait.ForUnixContainer().AddCustomWaitStrategy(new WaitUntil(DockerResourceConfiguration.AuthenticationEnabled.GetValueOrDefault()));
var waitStrategy = Wait.ForUnixContainer();

if (DockerResourceConfiguration.AuthenticationEnabled.GetValueOrDefault())
{
waitStrategy = waitStrategy.UntilFileExists(SecretKeyFilePath, FileSystem.Container);
}

if (DockerResourceConfiguration.FunctionsWorkerEnabled.GetValueOrDefault())
{
waitStrategy = waitStrategy.UntilMessageIsLogged("Function worker service started");
}

waitStrategy = waitStrategy.AddCustomWaitStrategy(new WaitUntil(DockerResourceConfiguration.AuthenticationEnabled.GetValueOrDefault()));

var pulsarBuilder = DockerResourceConfiguration.WaitStrategies.Count() > 1 ? this : WithWaitStrategy(waitStrategy);
return new PulsarContainer(pulsarBuilder.DockerResourceConfiguration);
}
Expand Down
22 changes: 18 additions & 4 deletions tests/Testcontainers.Pulsar.Tests/PulsarContainerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ namespace Testcontainers.Pulsar;

public abstract class PulsarContainerTest : IAsyncLifetime
{
private static readonly IReadOnlyDictionary<string, string> MemorySettings = new Dictionary<string, string> { { "PULSAR_MEM", "-Xms256m -Xmx512m" } };

private readonly PulsarContainer _pulsarContainer;

private readonly bool _authenticationEnabled;
Expand Down Expand Up @@ -69,7 +71,9 @@ public async Task ConsumerReceivesSendMessage()
public sealed class PulsarDefaultConfiguration : PulsarContainerTest
{
public PulsarDefaultConfiguration()
: base(new PulsarBuilder().Build(), false)
: base(new PulsarBuilder()
.WithEnvironment(MemorySettings)
.Build(), false)
{
}
}
Expand All @@ -79,7 +83,10 @@ public PulsarDefaultConfiguration()
public sealed class PulsarAuthConfiguration : PulsarContainerTest
{
public PulsarAuthConfiguration()
: base(new PulsarBuilder().WithAuthentication().Build(), true)
: base(new PulsarBuilder()
.WithAuthentication()
.WithEnvironment(MemorySettings)
.Build(), true)
{
}
}
Expand All @@ -88,7 +95,10 @@ public PulsarAuthConfiguration()
public sealed class PulsarV4Configuration : PulsarContainerTest
{
public PulsarV4Configuration()
: base(new PulsarBuilder().WithImage("apachepulsar/pulsar:4.0.2").Build(), false)
: base(new PulsarBuilder()
.WithImage("apachepulsar/pulsar:4.0.2")
.WithEnvironment(MemorySettings)
.Build(), false)
{
}
}
Expand All @@ -97,7 +107,11 @@ public PulsarV4Configuration()
public sealed class PulsarV4AuthConfiguration : PulsarContainerTest
{
public PulsarV4AuthConfiguration()
: base(new PulsarBuilder().WithImage("apachepulsar/pulsar:4.0.2").WithAuthentication().Build(), true)
: base(new PulsarBuilder()
.WithImage("apachepulsar/pulsar:4.0.2")
.WithAuthentication()
.WithEnvironment(MemorySettings)
.Build(), true)
{
}
}
Expand Down
1 change: 1 addition & 0 deletions tests/Testcontainers.Pulsar.Tests/Usings.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
global using System;
global using System.Collections.Generic;
global using System.Text;
global using System.Threading;
global using System.Threading.Tasks;
Expand Down