Skip to content

Fixing Racy ClusterLogVerboseEnabledSpec #5548

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

Merged
Aaronontheweb merged 4 commits into from
Jan 29, 2022
Merged

Fixing Racy ClusterLogVerboseEnabledSpec #5548

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
941c11a
* [Exp.] Increase `TimeOut` to 1 mins from default 3s
eaba Jan 28, 2022
3a68243
* Created `JoinAsync` of `Join`
eaba Jan 28, 2022
08fdc1f
Used `DownAsync` instead
eaba Jan 28, 2022
5e190f0
Merge branch 'dev' into cluster_log_verbose_cluster_events
eaba Jan 29, 2022
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
39 changes: 33 additions & 6 deletions src/core/Akka.Cluster.Tests/ClusterLogSpec.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

using System;
using System.Linq;
using System.Threading.Tasks;
using Akka.Actor;
using Akka.Configuration;
using Akka.TestKit;
Expand Down Expand Up @@ -67,6 +68,18 @@ protected void Join(string expected)
.ExpectOne(() => _cluster.Join(_selfAddress));
});
}
/// <summary>
/// The expected log info pattern to intercept after a <see cref="Cluster.Join(Address)"/>.
/// </summary>
protected async Task JoinAsync(string expected)
{
await WithinAsync(TimeSpan.FromSeconds(10), async () =>
{
await EventFilter
.Info(contains: expected)
.ExpectOneAsync(TimeSpan.FromMinutes(1), () => _cluster.Join(_selfAddress));

@eaba eaba Jan 28, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The default timeout was 3s....bumped this up to see how that goes! The test failed at times due to timeout.

});
}

/// <summary>
/// The expected log info pattern to intercept after a <see cref="Cluster.Down(Address)"/>.
Expand All @@ -81,6 +94,20 @@ protected void Down(string expected)
.ExpectOne(() => _cluster.Down(_selfAddress));
});
}

/// <summary>
/// The expected log info pattern to intercept after a <see cref="Cluster.Down(Address)"/>.
/// </summary>
/// <param name="expected"></param>
protected async Task DownAsync(string expected)
{
await WithinAsync(TimeSpan.FromSeconds(10), async () =>
{
await EventFilter
.Info(contains: expected)
.ExpectOneAsync(() => _cluster.Down(_selfAddress));
});
}
}

public class ClusterLogDefaultSpec : ClusterLogSpec
Expand All @@ -90,13 +117,13 @@ public ClusterLogDefaultSpec(ITestOutputHelper output)
{ }

[Fact]
public void A_cluster_must_log_a_message_when_becoming_and_stopping_being_a_leader()
public async Task A_cluster_must_log_a_message_when_becoming_and_stopping_being_a_leader()
{
_cluster.Settings.LogInfo.ShouldBeTrue();
_cluster.Settings.LogInfoVerbose.ShouldBeFalse();
Join("is the new leader");
await JoinAsync("is the new leader");
AwaitUp();
Down("is no longer leader");
await DownAsync("is no longer leader");
}
}

Expand Down Expand Up @@ -125,12 +152,12 @@ public ClusterLogVerboseEnabledSpec(ITestOutputHelper output)
{ }

[Fact]
public void A_cluster_must_log_verbose_cluster_events_when_log_info_verbose_is_on()
public async Task A_cluster_must_log_verbose_cluster_events_when_log_info_verbose_is_on()
{
_cluster.Settings.LogInfoVerbose.ShouldBeTrue();
Join(upLogMessage);
await JoinAsync(upLogMessage);
AwaitUp();
Down(downLogMessage);
await DownAsync(downLogMessage);
}
}
}