From 5f22a032cee3efd38145826bb0cc3b8f1777f117 Mon Sep 17 00:00:00 2001
From: Adam Sitnik <adam.sitnik@microsoft.com>
Date: Tue, 30 Nov 2021 17:02:31 +0100
Subject: [PATCH] re-enable and fix the SetOutReadToEnd test

---
 src/libraries/System.Console/tests/SetOut.cs                   | 2 +-
 src/libraries/System.Console/tests/System.Console.Tests.csproj | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libraries/System.Console/tests/SetOut.cs b/src/libraries/System.Console/tests/SetOut.cs
index 83d0f95f6e69e..c1a893c9e7691 100644
--- a/src/libraries/System.Console/tests/SetOut.cs
+++ b/src/libraries/System.Console/tests/SetOut.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using Xunit;
 
+[Collection(nameof(DisableParallelization))] // Console.Out is a static singleton, other tests should not be using it at the same time
 public class SetOut
 {
     [Fact]
@@ -28,7 +29,6 @@ public static void SetOutReadLine()
     }
 
     [Fact]
-    [ActiveIssue("https://github.com/dotnet/runtime/issues/57935", TestPlatforms.AnyUnix)]
     public static void SetOutReadToEnd()
     {
         Helpers.SetAndReadHelper(tw => Console.SetOut(tw), () => Console.Out, sr => sr.ReadToEnd());
diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj
index f92a0cdfc4913..3c83ac5db2f9e 100644
--- a/src/libraries/System.Console/tests/System.Console.Tests.csproj
+++ b/src/libraries/System.Console/tests/System.Console.Tests.csproj
@@ -28,6 +28,8 @@
              Link="Common\System\IO\InterceptStreamWriter.cs" />
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs"
              Link="Common\System\ShouldNotBeInvokedException.cs" />
+    <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelization.cs"
+             Link="Common\TestUtilities\System\DisableParallelization.cs" />
     <Compile Include="WindowAndCursorProps.cs" />
   </ItemGroup>
   <ItemGroup>