huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixup ProcessAsync_AwaitersUseTheResultOfExecutor (#21274) 

This test simulates concurrent calls on a CacheTagHelper to ensure only one enters a critical section.
However it re-uses a TagHelperOutput instance that's modified concurrently which isn't valid or what happens at runtime.

Fixes https://github.com/dotnet/aspnetcore/issues/20825
This commit is contained in:
Pranav K 2020-04-28 12:28:55 -07:00 committed by GitHub
parent 5ac720abb3
commit e73d0fb575
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mvc/Mvc.TagHelpers/test/CacheTagHelperTest.cs
View File

@ -908,26 +908,28 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
}; };
var invokeCount = 0; var invokeCount = 0;
var tagHelperOutput = new TagHelperOutput(
"cache",
new TagHelperAttributeList(),
getChildContentAsync: (useCachedResult, _) =>
{
invokeCount++;
var content = new DefaultTagHelperContent(); Func<bool, HtmlEncoder, Task<TagHelperContent>> getChildContentAsync = (useCachedResult, _) =>
content.SetContent(expected); {
return Task.FromResult<TagHelperContent>(content); invokeCount++;
});
var content = new DefaultTagHelperContent();
content.SetContent(expected);
return Task.FromResult<TagHelperContent>(content);
};
var tagHelperOutput1 = new TagHelperOutput("cache", new TagHelperAttributeList(), getChildContentAsync);
var tagHelperOutput2 = new TagHelperOutput("cache", new TagHelperAttributeList(), getChildContentAsync);
// Act // Act
var task1 = Task.Run(() => cacheTagHelper1.ProcessAsync(GetTagHelperContext(cache.Key1), tagHelperOutput)); var task1 = Task.Run(() => cacheTagHelper1.ProcessAsync(GetTagHelperContext(cache.Key1), tagHelperOutput1));
var task2 = Task.Run(() => cacheTagHelper2.ProcessAsync(GetTagHelperContext(cache.Key2), tagHelperOutput)); var task2 = Task.Run(() => cacheTagHelper2.ProcessAsync(GetTagHelperContext(cache.Key2), tagHelperOutput2));
// Assert // Assert
await Task.WhenAll(task1, task2); await Task.WhenAll(task1, task2);
Assert.Equal(encoder.Encode(expected), tagHelperOutput.Content.GetContent()); Assert.Equal(1, invokeCount); // We expect getChildContentAsync to be invoked exactly once.
Assert.Equal(1, invokeCount); Assert.Equal(encoder.Encode(expected), tagHelperOutput1.Content.GetContent());
Assert.Equal(encoder.Encode(expected), tagHelperOutput2.Content.GetContent());
} }
private static ViewContext GetViewContext() private static ViewContext GetViewContext()