From aebb921320f084ff68c3fa1cf6a175678a6983f3 Mon Sep 17 00:00:00 2001 From: John Luo Date: Sun, 8 Mar 2020 22:19:55 -0700 Subject: [PATCH] Re-enable AssemblyTestLogTests (#19686) --- src/Testing/test/AssemblyTestLogTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Testing/test/AssemblyTestLogTests.cs b/src/Testing/test/AssemblyTestLogTests.cs index a6f163e06a..3db8ffc0ce 100644 --- a/src/Testing/test/AssemblyTestLogTests.cs +++ b/src/Testing/test/AssemblyTestLogTests.cs @@ -18,7 +18,7 @@ namespace Microsoft.Extensions.Logging.Testing.Tests { private static readonly Assembly ThisAssembly = typeof(AssemblyTestLogTests).GetTypeInfo().Assembly; private static readonly string ThisAssemblyName = ThisAssembly.GetName().Name; - private static readonly string TFM = new DirectoryInfo(AppContext.BaseDirectory).Name; + private static readonly string TFM = ThisAssembly.GetCustomAttributes().OfType().FirstOrDefault().TargetFramework; [Fact] public void FunctionalLogs_LogsPreservedFromNonQuarantinedTest() @@ -76,7 +76,7 @@ namespace Microsoft.Extensions.Logging.Testing.Tests } }); - [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/19683")] + [Fact] public Task TestLogWritesToGlobalLogFile() => RunTestLogFunctionalTest((tempDir) => { @@ -120,7 +120,7 @@ namespace Microsoft.Extensions.Logging.Testing.Tests ", testLogContent, ignoreLineEndingDifferences: true); }); - [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/19683")] + [Fact] public Task TestLogTruncatesTestNameToAvoidLongPaths() => RunTestLogFunctionalTest((tempDir) => { @@ -147,7 +147,7 @@ namespace Microsoft.Extensions.Logging.Testing.Tests Assert.Equal(longTestName.Substring(longTestName.Length - testFileName.Length / 2, testFileName.Length / 2), testFileName.Substring(testFileName.Length - testFileName.Length / 2, testFileName.Length / 2)); }); - [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/19683")] + [Fact] public Task TestLogEnumerateFilenamesToAvoidCollisions() => RunTestLogFunctionalTest((tempDir) => {