Skip to content

[release/6.0] Don't create multiple large files at the same time #63032

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
danmoseley merged 6 commits into from
Dec 31, 2021
Merged

[release/6.0] Don't create multiple large files at the same time #63032

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04af7ae
Move NoInt32OverflowInTheBufferingLogic to OuterLoop and address pend…
jozkee Oct 19, 2021
8d0a914
Don't create multiple large files at the same time (#62519)
adamsitnik Dec 12, 2021
d02bc6f
Fix DisableParallelization build issue
jozkee Dec 21, 2021
d525882
Apply suggestions from code review
jozkee Dec 21, 2021
2bc8aa5
Update src/libraries/System.IO.FileSystem/tests/LargeFileTests.cs
jozkee Dec 21, 2021
11e9f38
Notepad with uppercase (#62487)
danmoseley Dec 7, 2021
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
Prev Previous commit
Next Next commit
Fix DisableParallelization build issue
  • Loading branch information
@jozkee
jozkee committed Dec 21, 2021
commit d02bc6f73004e6985022ed642169a3723495ecbd
5 changes: 4 additions & 1 deletion src/libraries/System.IO.FileSystem/tests/LargeFileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace System.IO.FileSystem.Tests
{
[OuterLoop]
[ActiveIssue("https://github.com/dotnet/runtime/issues/45954", TestPlatforms.Browser)]
[Collection(nameof(DisableParallelization))] // don't create multiple large files at the same time
[Collection("NoParallelTests")] // don't create multiple large files at the same time
public class LargeFileTests : FileSystemTest
{
[Fact]
Expand Down Expand Up @@ -58,4 +58,7 @@ public void NoInt32OverflowInTheBufferingLogic()
}
}
}

[CollectionDefinition("NoParallelTests", DisableParallelization = true)]
public partial class NoParallelTests { }
Copy link
Member

@akoeplinger akoeplinger Dec 21, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

we don't actually need this since we already have the same one here which you can include instead: https://github.com/dotnet/runtime/blob/release/6.0/src/libraries/Common/tests/System/Xml/DisableParallelization.cs

Copy link
Member

@akoeplinger akoeplinger Dec 21, 2021

Choose a reason for hiding this comment

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

ah looks like it is already that way in main, you'll need to include the file in the .csproj so it works:

runtime/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj

Line 218 in 1c09d36

<Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelization.cs" Link="Common\TestUtilities\System\DisableParallelization.cs" />

Copy link
Member Author

@jozkee jozkee Dec 21, 2021

Choose a reason for hiding this comment

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

File src\libraries\Common\tests\TestUtilities\System\DisableParallelization.cs doesn't exists in release/6.0.
I added the class here because that's how we were doing it prior to #62132.

Copy link
Member

@akoeplinger akoeplinger Dec 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Yeah it was in a different path in release/6.0 (see the linked file in my first comment), but this is just a cosmetic issue so fine if we keep what you have :)

}