Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Diable System.Net.Http.FunctionalTests parallel execution on UAP run #35004

Merged
merged 3 commits into from
Jan 31, 2019
Merged

Diable System.Net.Http.FunctionalTests parallel execution on UAP run #35004

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
726f1a8
diable parallel execution
caesar-chen Jan 31, 2019
45d83ae
fix format....
caesar-chen Jan 31, 2019
8768af4
address feedback
caesar-chen Jan 31, 2019
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
1 change: 1 addition & 0 deletions src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
<Compile Include="MultiInterfaceReadOnlyStream.cs" />
<Compile Include="MultiInterfaceStreamContent.cs" />
<Compile Include="PostScenarioUWPTest.cs" />
<Compile Include="XUnitAssemblyAttributes.cs" />
Copy link
Member

Choose a reason for hiding this comment

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

Don't you just want to import this for uap?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. So I put it under <ItemGroup Condition="'$(TargetGroup)' == 'uap'"> line 146.

Copy link
Member

Choose a reason for hiding this comment

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

Ah didn't see that on my phone. Thx

</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj">
Expand Down
8 changes: 8 additions & 0 deletions src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Xunit;

// [ActiveIssue(35002)]: Disabling parallel execution of System.Net.Http.FunctionalTests
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: you should modify the comment like this:

"Disable parallel execution of System.Net.Http.FunctionalTests on UAP test runs"

This way it is obvious if someone looks at this file they will know that this behavior is only for UAP test runs. Otherwise, they will have to look at the CSPROJ file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will fix.

[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true, MaxParallelThreads = 1)]
Copy link
Contributor

Choose a reason for hiding this comment

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

If "DisableTestParallelization = true" then does it matter whether or not you change "MaxParallelThread" at all, or even have it mentioned in this file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did some search online, having both is useful in some scenarios, for example: when some components in the test project are not compatible with the TPL, and xUnit uses TPL extensively, even when tests aren't being run in parallel.

I think it's fine to only keep DisableTestParallelization = true here.