diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs
index 7cc92be71c..d76277c1ca 100644
--- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs
+++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs
@@ -95,14 +95,9 @@ public async Task TestLogsAllCategoriesDefaultLevel(TestConfiguration config)
///
/// Test that log events at the default level are collected for categories without a specified level.
///
- [SkippableTheory(Skip = "Unreliable test https://github.com/dotnet/diagnostics/issues/3143"), MemberData(nameof(Configurations))]
+ [SkippableTheory(Skip = "Unreliable test https://github.com/dotnet/diagnostics/issues/2541"), MemberData(nameof(Configurations))]
public async Task TestLogsAllCategoriesDefaultLevelFallback(TestConfiguration config)
{
- if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
- {
- throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541");
- }
-
using Stream outputStream = await GetLogsAsync(config, settings => {
settings.UseAppFilters = false;
settings.LogLevel = LogLevel.Error;
diff --git a/src/tests/eventpipe/GCEvents.cs b/src/tests/eventpipe/GCEvents.cs
index c4374ff0a5..68bd728c70 100644
--- a/src/tests/eventpipe/GCEvents.cs
+++ b/src/tests/eventpipe/GCEvents.cs
@@ -204,34 +204,17 @@ await RemoteTestExecutorHelper.RunTestCaseAsync(() => {
};
Func> _DoesTraceContainEvents = (source) => {
- int GCCreateSegmentEvents = 0;
- int GCFreeSegmentEvents = 0;
- source.Clr.GCCreateSegment += (eventData) => GCCreateSegmentEvents += 1;
- source.Clr.GCFreeSegment += (eventData) => GCFreeSegmentEvents += 1;
-
int GCAllocationTickEvents = 0;
source.Clr.GCAllocationTick += (eventData) => GCAllocationTickEvents += 1;
- int GCCreateConcurrentThreadEvents = 0;
- int GCTerminateConcurrentThreadEvents = 0;
- source.Clr.GCCreateConcurrentThread += (eventData) => GCCreateConcurrentThreadEvents += 1;
- source.Clr.GCTerminateConcurrentThread += (eventData) => GCTerminateConcurrentThreadEvents += 1;
-
return () => {
Logger.logger.Log("Event counts validation");
- Logger.logger.Log("GCCreateSegmentEvents: " + GCCreateSegmentEvents);
- Logger.logger.Log("GCFreeSegmentEvents: " + GCFreeSegmentEvents);
-
- // Disable checking GCFreeSegmentEvents on .NET 7.0 issue: https://github.com/dotnet/diagnostics/issues/3143
- bool GCSegmentResult = GCCreateSegmentEvents > 0 && (GCFreeSegmentEvents > 0 || Environment.Version.Major >= 7);
- Logger.logger.Log("GCSegmentResult: " + GCSegmentResult);
-
Logger.logger.Log("GCAllocationTickEvents: " + GCAllocationTickEvents);
bool GCAllocationTickResult = GCAllocationTickEvents > 0;
Logger.logger.Log("GCAllocationTickResult: " + GCAllocationTickResult);
- bool GCCollectResults = GCSegmentResult && GCAllocationTickResult;
+ bool GCCollectResults = GCAllocationTickResult;
Logger.logger.Log("GCCollectResults: " + GCCollectResults);
return GCCollectResults ? 100 : -1;