Skip to content

Commit a77a207

Browse files
committed
test: require the invalid conpty bundle diagnostic
refs #3651
1 parent 83bff1c commit a77a207

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ jobs:
196196
-ExePath $exe `
197197
-Session "ci-conpty-invalid-windows-2022-$env:GITHUB_RUN_ID-$env:GITHUB_RUN_ATTEMPT"
198198
} catch {
199-
if ($_.Exception.Message -notlike "workspace create failed with exit code*" -and
200-
$_.Exception.Message -notlike "server exited with exit code*") {
199+
if ($_.Exception.Message -notlike "*Herdr's app-local ConPTY bundle is invalid:*") {
201200
throw
202201
}
203202
$rejected = $true

‎scripts/windows_smoke_conpty_path.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ try {
101101
$ErrorActionPreference = $savedErrorActionPreference
102102
}
103103
if ($createdExitCode -ne 0) {
104-
throw "workspace create failed with exit code $createdExitCode`: $($created -join "`n")"
104+
$serverError = Get-Content -LiteralPath $serverErrorPath -Raw
105+
throw "workspace create failed with exit code $createdExitCode`: $($created -join "`n")`n$serverError"
105106
}
106107
$paneId = (($created -join "`n") | ConvertFrom-Json).result.root_pane.pane_id
107108
if ([string]::IsNullOrWhiteSpace($paneId)) {

0 commit comments

Comments
 (0)