From 726f1a833a6dbd0715c71545638348ba667e5493 Mon Sep 17 00:00:00 2001 From: Caesar Chen Date: Thu, 31 Jan 2019 12:56:55 -0800 Subject: [PATCH 1/3] diable parallel execution --- .../System.Net.Http.Functional.Tests.csproj | 1 + .../tests/FunctionalTests/XUnitAssemblyAttributes.cs | 9 +++++++++ .../tests/XUnitAssemblyAttributes.cs | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs diff --git a/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index cbb1723052c4..dfcaa4314c61 100644 --- a/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -149,6 +149,7 @@ + diff --git a/src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs b/src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs new file mode 100644 index 000000000000..f8e762e92ffb --- /dev/null +++ b/src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs @@ -0,0 +1,9 @@ +// 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(20103)]: Disabling parallel execution of HttpListener tests +// until all of the hangs can be addressed +[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true, MaxParallelThreads = 1)] diff --git a/src/System.Net.HttpListener/tests/XUnitAssemblyAttributes.cs b/src/System.Net.HttpListener/tests/XUnitAssemblyAttributes.cs index f8e762e92ffb..6e8435f4d63a 100644 --- a/src/System.Net.HttpListener/tests/XUnitAssemblyAttributes.cs +++ b/src/System.Net.HttpListener/tests/XUnitAssemblyAttributes.cs @@ -4,6 +4,5 @@ using Xunit; -// [ActiveIssue(20103)]: Disabling parallel execution of HttpListener tests -// until all of the hangs can be addressed +// [ActiveIssue(35002)]: Disabling parallel execution of System.Net.Http.FunctionalTests [assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true, MaxParallelThreads = 1)] From 45d83ae668834deb7bf9abc3e1c0b73db5867c24 Mon Sep 17 00:00:00 2001 From: Caesar Chen Date: Thu, 31 Jan 2019 13:00:50 -0800 Subject: [PATCH 2/3] fix format.... --- .../tests/FunctionalTests/XUnitAssemblyAttributes.cs | 3 +-- src/System.Net.HttpListener/tests/XUnitAssemblyAttributes.cs | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs b/src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs index f8e762e92ffb..6e8435f4d63a 100644 --- a/src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs +++ b/src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs @@ -4,6 +4,5 @@ using Xunit; -// [ActiveIssue(20103)]: Disabling parallel execution of HttpListener tests -// until all of the hangs can be addressed +// [ActiveIssue(35002)]: Disabling parallel execution of System.Net.Http.FunctionalTests [assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true, MaxParallelThreads = 1)] diff --git a/src/System.Net.HttpListener/tests/XUnitAssemblyAttributes.cs b/src/System.Net.HttpListener/tests/XUnitAssemblyAttributes.cs index 6e8435f4d63a..f8e762e92ffb 100644 --- a/src/System.Net.HttpListener/tests/XUnitAssemblyAttributes.cs +++ b/src/System.Net.HttpListener/tests/XUnitAssemblyAttributes.cs @@ -4,5 +4,6 @@ using Xunit; -// [ActiveIssue(35002)]: Disabling parallel execution of System.Net.Http.FunctionalTests +// [ActiveIssue(20103)]: Disabling parallel execution of HttpListener tests +// until all of the hangs can be addressed [assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true, MaxParallelThreads = 1)] From 8768af4013f2ab6cfcdc419adfdac92a843ddfb3 Mon Sep 17 00:00:00 2001 From: Caesar Chen Date: Thu, 31 Jan 2019 13:58:46 -0800 Subject: [PATCH 3/3] address feedback --- .../tests/FunctionalTests/XUnitAssemblyAttributes.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs b/src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs index 6e8435f4d63a..c2e666b70516 100644 --- a/src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs +++ b/src/System.Net.Http/tests/FunctionalTests/XUnitAssemblyAttributes.cs @@ -4,5 +4,5 @@ using Xunit; -// [ActiveIssue(35002)]: Disabling parallel execution of System.Net.Http.FunctionalTests -[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true, MaxParallelThreads = 1)] +// [ActiveIssue(35002)]: Disable parallel execution of System.Net.Http.FunctionalTests on UAP test runs +[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly, DisableTestParallelization = true)]