Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -186,39 +186,44 @@ public void MarkSourcesWithStatus(IEnumerable<string?>? sources, DiscoveryStatus

foreach (var source in sources)
{
if (source is null)
MarkSourceWithStatus(source, status);
}
}

private void MarkSourceWithStatus(string? source, DiscoveryStatus status)
{
if (source is null)
{
return;
}

_sourcesWithDiscoveryStatus.AddOrUpdate(source,
_ =>
{
continue;
}
if (status != DiscoveryStatus.NotDiscovered)
{
EqtTrace.Warning($"DiscoveryDataAggregator.MarkSourcesWithStatus: Undiscovered {source} added with status: '{status}'.");
}
else
{
EqtTrace.Verbose($"DiscoveryDataAggregator.MarkSourcesWithStatus: Adding {source} with status: '{status}'.");
}

_sourcesWithDiscoveryStatus.AddOrUpdate(source,
_ =>
return status;
},
(_, previousStatus) =>
{
if (previousStatus == DiscoveryStatus.FullyDiscovered && status != DiscoveryStatus.FullyDiscovered
|| previousStatus == DiscoveryStatus.PartiallyDiscovered && (status == DiscoveryStatus.NotDiscovered || status == DiscoveryStatus.SkippedDiscovery))
{
if (status != DiscoveryStatus.NotDiscovered)
{
EqtTrace.Warning($"DiscoveryDataAggregator.MarkSourcesWithStatus: Undiscovered {source} added with status: '{status}'.");
}
else
{
EqtTrace.Verbose($"DiscoveryDataAggregator.MarkSourcesWithStatus: Adding {source} with status: '{status}'.");
}

return status;
},
(_, previousStatus) =>
EqtTrace.Warning($"DiscoveryDataAggregator.MarkSourcesWithStatus: Downgrading source {source} status from '{previousStatus}' to '{status}'.");
}
else if (previousStatus != status)
{
if (previousStatus == DiscoveryStatus.FullyDiscovered && status != DiscoveryStatus.FullyDiscovered
|| previousStatus == DiscoveryStatus.PartiallyDiscovered && (status == DiscoveryStatus.NotDiscovered || status == DiscoveryStatus.SkippedDiscovery))
{
EqtTrace.Warning($"DiscoveryDataAggregator.MarkSourcesWithStatus: Downgrading source {source} status from '{previousStatus}' to '{status}'.");
}
else if (previousStatus != status)
{
EqtTrace.Verbose($"DiscoveryDataAggregator.MarkSourcesWithStatus: Upgrading {source} status from '{previousStatus}' to '{status}'.");
}
return status;
});
}
EqtTrace.Verbose($"DiscoveryDataAggregator.MarkSourcesWithStatus: Upgrading {source} status from '{previousStatus}' to '{status}'.");
}
return status;
});
}

/// <summary>
Expand Down Expand Up @@ -247,19 +252,19 @@ public void MarkSourcesWithStatus(IEnumerable<string?>? sources, DiscoveryStatus
{
var currentSource = testCase.Source;

// We rely on the fact that sources are processed in a sequential way, which
// means that when we receive a different source than the previous, we can
// assume that the previous source was fully discovered.
if (previousSource is null || previousSource == currentSource)
// Sources arrive sequentially; when source changes the previous one is fully discovered.
if (previousSource is null)
{
MarkSourcesWithStatus(new[] { currentSource }, DiscoveryStatus.PartiallyDiscovered);
// First test case seen: mark this source as partially discovered.
MarkSourceWithStatus(currentSource, DiscoveryStatus.PartiallyDiscovered);
}
else if (currentSource != previousSource)
{
EqtTrace.Verbose($"DiscoveryDataAggregator.MarkSourcesBasedOnDiscoveredTestCases: Discovered test source changed from {previousSource} to {currentSource}.");
MarkSourcesWithStatus(new[] { previousSource }, DiscoveryStatus.FullyDiscovered);
MarkSourcesWithStatus(new[] { currentSource }, DiscoveryStatus.PartiallyDiscovered);
MarkSourceWithStatus(previousSource, DiscoveryStatus.FullyDiscovered);
MarkSourceWithStatus(currentSource, DiscoveryStatus.PartiallyDiscovered);
}
// When currentSource == previousSource: status already PartiallyDiscovered; skip.

previousSource = currentSource;
}
Expand Down
Loading