Skip to content

Commit

Permalink
[automated] Merge branch 'release/2.1' => 'release/3.1' (#3858)
Browse files Browse the repository at this point in the history
* Update branding to 2.1.27 (#3842)

* Update branding to 2.1.27

* Fix patchconfig, baseline val

* Update SDK and baseline

* [release/2.1] Update branding to 2.1.28 (#3855)

* Update branding to 2.1.28

* Bump incoming package patch versions
- e.g. `$(MicrosoftNETCoreAppPackageVersion)`
- updated xunit.assert and xunit.extensibility.execution minor versions
    - align with xunit package version

* Use Ubuntu 18.04 build agents
- set locale consistently on all platforms
    - default locale on newer agents is unloved `C.UTF-8`

* !flaky fix! Double compaction timeouts

Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: John Luo <johluo@microsoft.com>
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Co-authored-by: Sebastien Ros <sebastienros@gmail.com>
  • Loading branch information
5 people authored Apr 8, 2021
1 parent 1594096 commit 4d2e714
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/Caching/Memory/test/CapacityTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public async Task DoNotAddIfSizeOverflows()
Assert.Null(cache.Get("key1"));

// Wait for compaction to complete
Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(10)));
Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(20)));

// Compaction removes old item
Assert.Null(cache.Get("key"));
Expand Down Expand Up @@ -175,7 +175,7 @@ public async Task ExceedsCapacityCompacts()
cache.Set("key2", "value2", new MemoryCacheEntryOptions { Size = 5 });

// Wait for compaction to complete
Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(10)));
Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(20)));

Assert.Null(cache.Get("key"));
Assert.Null(cache.Get("key2"));
Expand Down Expand Up @@ -268,7 +268,7 @@ public async Task AddingReplacementWhenTotalSizeExceedsCapacityDoesNotUpdateRemo
cache.Set("key", "value1", new MemoryCacheEntryOptions { Size = 5 });

// Wait for compaction to complete
Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(10)));
Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(20)));

Assert.Null(cache.Get("key"));
Assert.Equal(0, cache.Size);
Expand Down Expand Up @@ -341,7 +341,7 @@ public async Task ExpiringEntryDecreasesCacheSize()
Assert.Null(cache.Get("key"));

// Wait for compaction to complete
Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(10)));
Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(20)));

Assert.Equal(0, cache.Size);
}
Expand Down

0 comments on commit 4d2e714

Please sign in to comment.