Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OSOE-464: Streaming stdout #338

Merged
Merged
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
17 changes: 9 additions & 8 deletions .github/actions/test-dotnet/Invoke-SolutionTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -125,18 +125,18 @@ function StartProcessAndWaitForExit($FileName, $Arguments, $Timeout = -1)
}
}

$output = New-Object System.Text.StringBuilder
$eventHandlerArgs = @{
Output = $output
Process = $process
HasTestRunSuccessful = $false
}

$stdoutEvent = Register-ObjectEvent $process -EventName OutputDataReceived -MessageData $eventHandlerArgs -Action {
$Event.MessageData.Output.AppendLine($Event.SourceEventArgs.Data)
$Event.SourceEventArgs.Data | Out-Host
$Event.MessageData.HasTestRunSuccessful = $Event.MessageData.HasTestRunSuccessful -or ($Event.SourceEventArgs.Data -Like '*Test Run Successful.*')
}

$stderrEvent = Register-ObjectEvent $process -EventName ErrorDataReceived -MessageData $eventHandlerArgs -Action {
$Event.MessageData.Output.AppendLine($Event.SourceEventArgs.Data)
$Event.SourceEventArgs.Data | Out-Host
}

$process.Start() | Out-Null
Expand All @@ -151,6 +151,7 @@ function StartProcessAndWaitForExit($FileName, $Arguments, $Timeout = -1)
}
else
{
$output = New-Object System.Text.StringBuilder
$output.AppendLine("::warning::The process $($process.Id) didn't exit in $Timeout seconds.")

$output.AppendLine("::warning::Collecting a dump of the process $($process.Id) tree.")
Expand All @@ -163,15 +164,17 @@ function StartProcessAndWaitForExit($FileName, $Arguments, $Timeout = -1)
Set-GitHubOutput 'dotnet-test-hang-dump' 1

KillProcessTree -Output $output -Process $rootProcess

Write-Output $output.ToString()
}

Unregister-Event $stdoutEvent.Id
Unregister-Event $stderrEvent.Id

return @{
Output = $output.ToString()
ExitCode = $exitCode
HasExited = $hasExited
HasTestRunSuccessful = $eventHandlerArgs.HasTestRunSuccessful
}
}

Expand Down Expand Up @@ -200,9 +203,7 @@ foreach ($test in $tests)

$processResult = StartProcessAndWaitForExit -FileName 'dotnet' -Arguments "test $($dotnetTestSwitches -join ' ')" -Timeout $TestProcessTimeout

Write-Output $processResult.Output

if ($processResult.ExitCode -eq 0 || (!$processResult.HasExited && $processResult.Output -Like '*Test Run Successful.*'))
if ($processResult.ExitCode -eq 0 || (!$processResult.HasExited && $processResult.HasTestRunSuccessful))
{
if (!$processResult.HasExited)
{
Expand Down
Loading