From 15e2ee6918ede0d6a2c5d93469f1c0618e9779d1 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Tue, 2 Jun 2020 16:53:46 -0700 Subject: [PATCH] Revert "Adding A log presence check before trying to delete (#36779)" (#37323) This reverts commit 96401ea68292a1de87d7675d534d8ca37e4f7066. --- .../EventLogTests/EventLogSourceCreationTests.cs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/libraries/System.Diagnostics.EventLog/tests/EventLogTests/EventLogSourceCreationTests.cs b/src/libraries/System.Diagnostics.EventLog/tests/EventLogTests/EventLogSourceCreationTests.cs index eaaa616..fc2e0f3 100644 --- a/src/libraries/System.Diagnostics.EventLog/tests/EventLogTests/EventLogSourceCreationTests.cs +++ b/src/libraries/System.Diagnostics.EventLog/tests/EventLogTests/EventLogSourceCreationTests.cs @@ -3,11 +3,13 @@ // See the LICENSE file in the project root for more information. using Xunit; +using Microsoft.DotNet.XUnitExtensions; namespace System.Diagnostics.Tests { public class EventLogSourceCreationTests { + [ActiveIssue("https://github.com/dotnet/runtime/issues/36135")] [ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndSupportsEventLogs))] public void CheckSourceExistenceAndDeletion() { @@ -21,13 +23,13 @@ namespace System.Diagnostics.Tests finally { EventLog.DeleteEventSource(source); - if (EventLog.Exists(log)) - Helpers.Retry(() => EventLog.Delete(log)); + Helpers.Retry(() => EventLog.Delete(log)); // unlike other tests, throw if delete fails } Assert.False(EventLog.SourceExists(source)); } + [ActiveIssue("https://github.com/dotnet/runtime/issues/36135")] [ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndSupportsEventLogs))] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] public void LogNameWithSame8FirstChars_NetCore() @@ -48,15 +50,13 @@ namespace System.Diagnostics.Tests finally { EventLog.DeleteEventSource(firstSource); - if (EventLog.Exists(firstLog)) - Helpers.Retry(() => EventLog.Delete(firstLog)); - + Helpers.Retry(() => EventLog.Delete(firstLog)); EventLog.DeleteEventSource(secondSource); - if (EventLog.Exists(secondLog)) - Helpers.Retry(() => EventLog.Delete(secondLog)); + Helpers.Retry(() => EventLog.Delete(secondLog)); } } + [ActiveIssue("https://github.com/dotnet/runtime/issues/36135")] [ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndSupportsEventLogs))] [SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)] public void LogNameWithSame8FirstChars_NetFramework() @@ -75,8 +75,7 @@ namespace System.Diagnostics.Tests finally { EventLog.DeleteEventSource(firstSource); - if (EventLog.Exists(firstLog)) - Helpers.Retry(() => EventLog.Delete(firstLog)); + Helpers.Retry(() => EventLog.Delete(firstLog)); } } @@ -146,6 +145,7 @@ namespace System.Diagnostics.Tests Assert.Throws(() => EventLog.CreateEventSource(null)); } + [ActiveIssue("https://github.com/dotnet/runtime/issues/36135")] [ConditionalFact(typeof(Helpers), nameof(Helpers.IsElevatedAndSupportsEventLogs))] public void SourceAlreadyExistsWhenCreatingSource() { @@ -160,8 +160,7 @@ namespace System.Diagnostics.Tests finally { EventLog.DeleteEventSource(source); - if (EventLog.Exists(log)) - Helpers.RetrySilently(() => EventLog.Delete(log)); + Helpers.RetrySilently(() => EventLog.Delete(log)); } } -- 2.7.4