Skip to content

Attempt to fix flaky GetRemovesExpired_Async test #5569

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+4 −6
Open

Attempt to fix flaky GetRemovesExpired_Async test #5569

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
039be97
Attempt to fix flaky cache test
Avery-Dunn Nov 5, 2025
7aeba82
Rename methods
Avery-Dunn Nov 5, 2025
683cf1d
Merge branch 'main' into avdunn/flaky-test
Avery-Dunn Nov 5, 2025
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
10 changes: 4 additions & 6 deletions tests/Microsoft.Identity.Test.Unit/Throttling/ThrottlingCacheTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,15 @@ public class ThrottlingCacheTests
private readonly MsalServiceException _ex2 = new MsalServiceException("code2", "msg2");

[TestMethod]
public async Task GetRemovesExpired_Async()
public void GetRemovesExpired()
{
// Arrange
ThrottlingCache cache = new ThrottlingCache();

cache.AddAndCleanup("k1", new ThrottlingCacheEntry(_ex1, TimeSpan.FromMilliseconds(1)), _logger); // expired
cache.AddAndCleanup("k1", new ThrottlingCacheEntry(_ex1, TimeSpan.FromMilliseconds(-10000)), _logger); // expired
cache.AddAndCleanup("k2", new ThrottlingCacheEntry(_ex2, TimeSpan.FromMilliseconds(10000)), _logger);

// Act
await Task.Delay(1).ConfigureAwait(false);
bool isFound1 = cache.TryGetOrRemoveExpired("k1", _logger, out MsalServiceException foundEx1);
bool isFound2 = cache.TryGetOrRemoveExpired("k2", _logger, out MsalServiceException foundEx2);

Expand All @@ -39,16 +38,15 @@ public async Task GetRemovesExpired_Async()
}

[TestMethod]
public async Task TestCleanup_Async()
public void TestCleanup()
{
// Arrange
ThrottlingCache cache = new ThrottlingCache(50);

cache.AddAndCleanup("k1", new ThrottlingCacheEntry(_ex1, TimeSpan.FromMilliseconds(1)), _logger); // expired
cache.AddAndCleanup("k1", new ThrottlingCacheEntry(_ex1, TimeSpan.FromMilliseconds(-10000)), _logger); // expired
cache.AddAndCleanup("k2", new ThrottlingCacheEntry(_ex2, TimeSpan.FromMilliseconds(10000)), _logger);

// Act - should trigger a cleanup
await Task.Delay(50).ConfigureAwait(false);
cache.AddAndCleanup("k3", new ThrottlingCacheEntry(_ex2, TimeSpan.FromMilliseconds(1000)), _logger);

// Assert
Expand Down