fix: 让 5.1 真正可用（显式编码 + 原生 stderr 处理 + .psd1 夹具带 BOM）
上一提交让 5.1 能解析源码，但 Unit 与 Smoke 在 5.1 上仍然是红的。根因是三类彼此 无关的 5.1/7 行为差，全部实测确认： 1) 不写 -Encoding 时，5.1 的 Get-Content / Set-Content 默认是 ANSI，7 是 UTF-8。 症状是 UTF-8 字节被按 GBK 解出「璇存槑」这类乱码。62 处补上显式 -Encoding UTF8。 用 AST 而不是正则定位，避免把注释里的散文也改掉。 2) .psd1 夹具用无 BOM 写，而引擎的 .psd1 读取器（Import-PowerShellDataFile）只能靠 BOM 判断编码、没有参数可传，于是 5.1 按 ANSI 解。40 处夹具改为带 BOM 写 —— 这正是 .editorconfig 里 [*.psd1] charset = utf-8-bom 本来就要求的，是夹具违反了自己的约定。 .cmd 批次文件刻意保持无 BOM：cmd.exe 会被 BOM 弄坏。 3) 5.1 在 $ErrorActionPreference = Stop 下会把原生命令写到 stderr 的内容升级成终止性 NativeCommandError，7 改了这条。takeown/icacls 的 ACL 复位调用、以及 test.ps1 自己 调子进程的地方，都需要在 Continue 下跑。 验收：test.ps1 9/9 全绿（Encode + Parse + Unit + Smoke + E2E，在 7 与 5.1 上各跑一遍）。 已知未处理（留待后续提交）：tools/lab/** 里还有若干「原生命令 + 2>&1 + Stop」的同类 写法（takeown / icacls / scoop / code / Get-WimInfo）。它们要 Hyper-V 实验机才跑得到， 不在验收门槛内。
This commit is contained in:
Shuery committed
1 parent
2d26f78d15
commit
e10503be76
13 files changed
+122
-104
No files matched your search
+30
-30
@@ -385,8 +385,8 @@ Test-Case '归档项的属性集与契约一致（没有旧的 Sources / Dirs /
|
||||
Test-Case 'New-BaknretArchiveStaging：目录走 junction、文件走硬链接，按归档内名字挂载' {
|
||||
$root = Join-Path $itemSandbox 'stage-src'
|
||||
New-Item -ItemType Directory -Path (Join-Path $root 'App') -Force | Out-Null
|
||||
Set-Content -LiteralPath (Join-Path $root 'App\f.txt') -Value 'x'
|
||||
Set-Content -LiteralPath (Join-Path $root 'settings.json') -Value '{}'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $root 'App\f.txt') -Value 'x'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $root 'settings.json') -Value '{}'
|
||||
|
||||
$items = @(
|
||||
(New-BaknretArchiveItem -ArchivePath 'AlphaData' -RealPath (Join-Path $root 'App') -Exists $true),
|
||||
@@ -412,7 +412,7 @@ Test-Case 'New-BaknretJunction / Remove-BaknretJunction：只删连接点，不
|
||||
$target = Join-Path $itemSandbox 'j-target'
|
||||
$link = Join-Path $itemSandbox 'j-link'
|
||||
New-Item -ItemType Directory -Path $target -Force | Out-Null
|
||||
Set-Content -LiteralPath (Join-Path $target 'keep.txt') -Value 'keep'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $target 'keep.txt') -Value 'keep'
|
||||
|
||||
New-BaknretJunction -Path $link -Target $target | Out-Null
|
||||
Assert-Equal 'Junction' (Get-Item -LiteralPath $link -Force).LinkType
|
||||
@@ -630,7 +630,7 @@ Test-Case '配置缺失时返回默认值' {
|
||||
|
||||
Test-Case '配置嵌套段落合并且不丢默认键' {
|
||||
$path = Join-Path $sandbox 'cfg.psd1'
|
||||
Set-Content -LiteralPath $path -Value "@{ Encryption = @{ Enabled = `$true }; CompressionLevel = 5 }"
|
||||
Set-Content -Encoding UTF8 -LiteralPath $path -Value "@{ Encryption = @{ Enabled = `$true }; CompressionLevel = 5 }"
|
||||
$config = Get-BaknretConfig -Path $path
|
||||
Assert-Equal 5 $config.CompressionLevel
|
||||
Assert-True $config.Encryption.Enabled
|
||||
@@ -663,7 +663,7 @@ $configDir = Join-Path $catalogSandbox 'Config'
|
||||
Test-Case '名录解析：裸键、引号键、带 - 与 . 的名字' {
|
||||
$catPath = Join-Path $catalogSandbox 'SoftwareCatalog.psd1'
|
||||
$content = "@{`n FooClolor = @{ DefaultData = @{ Path = '$appDir' } }`n 'scoop-config' = @{ DefaultConfig = @{ Path = '$configDir' } }`n '.ssh' = @{ DefaultData = @{ Path = '$appDir' } }`n}`n"
|
||||
[System.IO.File]::WriteAllText($catPath, $content, [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($catPath, $content, [System.Text.UTF8Encoding]::new($true))
|
||||
|
||||
$catalog = Get-SoftwareCatalog -Path $catPath -NoCache
|
||||
Assert-Equal 3 $catalog.Count
|
||||
@@ -675,7 +675,7 @@ Test-Case '名录解析：裸键、引号键、带 - 与 . 的名字' {
|
||||
|
||||
Test-Case '名录：Slot 按名字排序（哈希表顺序不可依赖）' {
|
||||
$catPath = Join-Path $catalogSandbox 'sorted.psd1'
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n FooClolor = @{ Zeta = @{ Path = '$appDir' }; Alpha = @{ Path = '$configDir' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n FooClolor = @{ Zeta = @{ Path = '$appDir' }; Alpha = @{ Path = '$configDir' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
|
||||
$catalog = Get-SoftwareCatalog -Path $catPath -NoCache
|
||||
Assert-Equal 'Multi' $catalog['FooClolor'].Kind
|
||||
@@ -687,8 +687,8 @@ Test-Case '名录：Slot 按名字排序（哈希表顺序不可依赖）' {
|
||||
Test-Case '名录：Slot 对象字段与契约一致' {
|
||||
$catPath = Join-Path $catalogSandbox 'fields.psd1'
|
||||
$filePath = Join-Path $catalogSandbox 'App\settings.json'
|
||||
Set-Content -LiteralPath $filePath -Value '{}'
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n Rich = @{`n Beta = @{ Path = '$filePath'; Encrypt = `$true; Description = 'beta 说明' }`n Alpha = @{ Path = '$configDir'; Exclude = '!*Cache,sub\one'; Include = 'Modules:$appDir' }`n }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
Set-Content -Encoding UTF8 -LiteralPath $filePath -Value '{}'
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n Rich = @{`n Beta = @{ Path = '$filePath'; Encrypt = `$true; Description = 'beta 说明' }`n Alpha = @{ Path = '$configDir'; Exclude = '!*Cache,sub\one'; Include = 'Modules:$appDir' }`n }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
|
||||
$catalog = Get-SoftwareCatalog -Path $catPath -NoCache
|
||||
$entry = $catalog['Rich']
|
||||
@@ -721,7 +721,7 @@ Test-Case '名录解析：目录带版本后缀时按前缀补全（legendary_2.
|
||||
$root = Join-Path $catalogSandbox 'probe'
|
||||
New-Item -ItemType Directory -Path (Join-Path $root 'legendary_2.0.4') -Force | Out-Null
|
||||
$catPath = Join-Path $catalogSandbox 'suffix.psd1'
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n legendary = @{ DefaultConfig = @{ Path = '$root\legendary' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n legendary = @{ DefaultConfig = @{ Path = '$root\legendary' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
|
||||
$catalog = Get-SoftwareCatalog -Path $catPath -NoCache
|
||||
Assert-Equal 'Single' $catalog['legendary'].Kind
|
||||
@@ -733,7 +733,7 @@ Test-Case '名录解析：不会把 Legendary 误配成 LegendarySomething' {
|
||||
$root = Join-Path $catalogSandbox 'strict'
|
||||
New-Item -ItemType Directory -Path (Join-Path $root 'LegendarySomething') -Force | Out-Null
|
||||
$catPath = Join-Path $catalogSandbox 'strict.psd1'
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n Legendary = @{ DefaultConfig = @{ Path = '$root\Legendary' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n Legendary = @{ DefaultConfig = @{ Path = '$root\Legendary' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
|
||||
$catalog = Get-SoftwareCatalog -Path $catPath -NoCache
|
||||
Assert-Equal 'Unresolved' $catalog['Legendary'].Kind '必须以下一个字符是 _ 或 - 为界'
|
||||
@@ -759,7 +759,7 @@ Test-Case '名录：一个 Slot 补全出多个目录时明确报错（否则会
|
||||
New-Item -ItemType Directory -Path (Join-Path $root 'Legendary_1') -Force | Out-Null
|
||||
New-Item -ItemType Directory -Path (Join-Path $root 'Legendary_2') -Force | Out-Null
|
||||
$catPath = Join-Path $catalogSandbox 'multicand.psd1'
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n Legendary = @{ DefaultConfig = @{ Path = '$root\Legendary' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n Legendary = @{ DefaultConfig = @{ Path = '$root\Legendary' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
|
||||
$catalog = Get-SoftwareCatalog -Path $catPath -NoCache
|
||||
$entry = $catalog['Legendary']
|
||||
@@ -769,7 +769,7 @@ Test-Case '名录：一个 Slot 补全出多个目录时明确报错（否则会
|
||||
|
||||
Test-Case '名录：Slot 写法不对 / 缺少 Path 都记成 Error，而不是崩掉' {
|
||||
$bad = Join-Path $catalogSandbox 'bad.psd1'
|
||||
[System.IO.File]::WriteAllText($bad, "@{`n A = @{ S = 'C:\x' }`n B = @{ S = @{ Description = 'x' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($bad, "@{`n A = @{ S = 'C:\x' }`n B = @{ S = @{ Description = 'x' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
$catalog = Get-SoftwareCatalog -Path $bad -NoCache
|
||||
Assert-Equal 'Invalid' $catalog['A'].Kind
|
||||
Assert-True ($catalog['A'].Error -like '*Slot S*')
|
||||
@@ -779,12 +779,12 @@ Test-Case '名录：Slot 写法不对 / 缺少 Path 都记成 Error，而不是
|
||||
|
||||
Test-Case '名录：裸字符串 / 数组等旧结构会被 ERROR 跳过（不再当目录用）' {
|
||||
$legacy = Join-Path $catalogSandbox 'legacy.psd1'
|
||||
[System.IO.File]::WriteAllText($legacy, "@{`n A = 'C:\Programs\A'`n B = @('C:\1','C:\2')`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($legacy, "@{`n A = 'C:\Programs\A'`n B = @('C:\1','C:\2')`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
$catalog = Get-SoftwareCatalog -Path $legacy -NoCache
|
||||
Assert-Equal 0 $catalog.Count '旧结构必须被跳过，不能猜成目录'
|
||||
|
||||
$dirs = Join-Path $catalogSandbox 'dirs.psd1'
|
||||
[System.IO.File]::WriteAllText($dirs, "@{`n C = @{ Dirs = @('C:\1','C:\2') }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($dirs, "@{`n C = @{ Dirs = @('C:\1','C:\2') }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
$catalog = Get-SoftwareCatalog -Path $dirs -NoCache
|
||||
Assert-Equal 1 $catalog.Count
|
||||
Assert-Equal 'Invalid' $catalog['C'].Kind
|
||||
@@ -800,8 +800,8 @@ Test-Case '名录：%VAR% 与 $( ... ) 子表达式都会被展开' {
|
||||
Test-Case '名录：Includes 分文件维护会被合并' {
|
||||
$extraPath = Join-Path $catalogSandbox 'Extra.psd1'
|
||||
$basePath = Join-Path $catalogSandbox 'Base.psd1'
|
||||
[System.IO.File]::WriteAllText($extraPath, "@{`n 'extra-app' = @{ D = @{ Path = '$appDir' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($basePath, "@{`n Includes = @('Extra.psd1')`n 'base-app' = @{ D = @{ Path = '$configDir' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($extraPath, "@{`n 'extra-app' = @{ D = @{ Path = '$appDir' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
[System.IO.File]::WriteAllText($basePath, "@{`n Includes = @('Extra.psd1')`n 'base-app' = @{ D = @{ Path = '$configDir' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
|
||||
$catalog = Get-SoftwareCatalog -Path $basePath -NoCache
|
||||
Assert-True $catalog.ContainsKey('base-app')
|
||||
@@ -810,7 +810,7 @@ Test-Case '名录：Includes 分文件维护会被合并' {
|
||||
|
||||
Test-Case '名录：结果按文件指纹缓存，-NoCache 强制重读' {
|
||||
$catPath = Join-Path $catalogSandbox 'cache.psd1'
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n Cached = @{ D = @{ Path = '$appDir' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n Cached = @{ D = @{ Path = '$appDir' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
|
||||
$first = Get-SoftwareCatalog -Path $catPath
|
||||
$second = Get-SoftwareCatalog -Path $catPath
|
||||
@@ -819,7 +819,7 @@ Test-Case '名录：结果按文件指纹缓存，-NoCache 强制重读' {
|
||||
$fresh = Get-SoftwareCatalog -Path $catPath -NoCache
|
||||
Assert-False ([object]::ReferenceEquals($first, $fresh)) '-NoCache 必须重新读'
|
||||
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n Cached = @{ D = @{ Path = '$configDir' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n Cached = @{ D = @{ Path = '$configDir' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
$changed = Get-SoftwareCatalog -Path $catPath
|
||||
Assert-Equal $configDir $changed['Cached'].Slots[0].Resolved '文件变了缓存必须失效'
|
||||
}
|
||||
@@ -918,7 +918,7 @@ Test-Case '名录里没有该名字：BaseName 退回可读目录名，并给出
|
||||
|
||||
Test-Case '名录里的路径不存在时仍给出归档项（恢复要靠它还原回原位）' {
|
||||
$catPath = Join-Path $resolveSandbox 'gone.psd1'
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n 'gone-app' = @{ DefaultData = @{ Path = 'C:\definitely\not\here' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n 'gone-app' = @{ DefaultData = @{ Path = 'C:\definitely\not\here' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
$item = ConvertFrom-BackupListLine -Line 'gone-app'
|
||||
$resolved = Resolve-BackupEntry -Entry $item -CatalogPath $catPath
|
||||
Assert-Equal 1 $resolved.Items.Count '恢复端据 Items 还原'
|
||||
@@ -943,7 +943,7 @@ Test-Case '条目级 :+ 覆盖名录里的 Include（不是叠加）' {
|
||||
$incDir = Join-Path $resolveSandbox 'Inc'
|
||||
New-Item -ItemType Directory -Path $incDir -Force | Out-Null
|
||||
$catPath = Join-Path $resolveSandbox 'withinc.psd1'
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n IncApp = @{ DefaultData = @{ Path = '$dirA'; Include = 'CatalogInc:$incDir' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n IncApp = @{ DefaultData = @{ Path = '$dirA'; Include = 'CatalogInc:$incDir' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
|
||||
$plain = Resolve-BackupEntry -Entry (ConvertFrom-BackupListLine -Line 'IncApp') -CatalogPath $catPath
|
||||
Assert-Equal 2 $plain.Items.Count
|
||||
@@ -988,7 +988,7 @@ Test-Case '方向标记随条目一路传到 Resolve-BackupEntry' {
|
||||
|
||||
Test-Case '条目级 :- 覆盖名录里的 Exclude（不是叠加）' {
|
||||
$catPath = Join-Path $resolveSandbox 'withexc.psd1'
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n ExcApp = @{ DefaultData = @{ Path = '$dirA'; Exclude = '!*CatalogCache' } }`n}`n", [System.Text.UTF8Encoding]::new($false))
|
||||
[System.IO.File]::WriteAllText($catPath, "@{`n ExcApp = @{ DefaultData = @{ Path = '$dirA'; Exclude = '!*CatalogCache' } }`n}`n", [System.Text.UTF8Encoding]::new($true))
|
||||
|
||||
$plain = Resolve-BackupEntry -Entry (ConvertFrom-BackupListLine -Line 'ExcApp') -CatalogPath $catPath
|
||||
Assert-False $plain.HasExcludeOverride
|
||||
@@ -1018,12 +1018,12 @@ if (-not $sevenZip) {
|
||||
foreach ($d in 'Default\Cache', 'Default\Code Cache', 'Default\Extensions', 'component_crx_cache', 'Default\IndexedDB') {
|
||||
New-Item -ItemType Directory -Path (Join-Path $source $d) -Force | Out-Null
|
||||
}
|
||||
Set-Content -LiteralPath (Join-Path $source 'keep.txt') 'keep'
|
||||
Set-Content -LiteralPath (Join-Path $source 'Default\Cache\c.bin') 'c'
|
||||
Set-Content -LiteralPath (Join-Path $source 'Default\Code Cache\cc.bin') 'cc'
|
||||
Set-Content -LiteralPath (Join-Path $source 'Default\Extensions\e.bin') 'e'
|
||||
Set-Content -LiteralPath (Join-Path $source 'component_crx_cache\x.bin') 'x'
|
||||
Set-Content -LiteralPath (Join-Path $source 'Default\IndexedDB\i.bin') 'i'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $source 'keep.txt') 'keep'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $source 'Default\Cache\c.bin') 'c'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $source 'Default\Code Cache\cc.bin') 'cc'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $source 'Default\Extensions\e.bin') 'e'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $source 'component_crx_cache\x.bin') 'x'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $source 'Default\IndexedDB\i.bin') 'i'
|
||||
|
||||
$patterns = @('!*Cache', 'component_crx_cache', 'Default\Code Cache', 'Default\Extensions', 'Default\IndexedDB')
|
||||
$archiveItem = New-BaknretArchiveItem -ArchivePath $itemName -RealPath $source -Kind 'path' -Exists $true
|
||||
@@ -1054,7 +1054,7 @@ if (-not $sevenZip) {
|
||||
$source = Join-Path $root $itemName
|
||||
foreach ($d in 'Cache1', 'Cache2', 'Keep', 'sub\Cache3') {
|
||||
New-Item -ItemType Directory -Path (Join-Path $source $d) -Force | Out-Null
|
||||
Set-Content -LiteralPath (Join-Path $source "$d\x.bin") 'x'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $source "$d\x.bin") 'x'
|
||||
}
|
||||
|
||||
$archiveItem = New-BaknretArchiveItem -ArchivePath $itemName -RealPath $source -Kind 'slot' -Exists $true
|
||||
@@ -1096,8 +1096,8 @@ if (-not $sevenZip) {
|
||||
$root = Join-Path $sandbox 'topnames'
|
||||
New-Item -ItemType Directory -Path (Join-Path $root 'Alpha') -Force | Out-Null
|
||||
New-Item -ItemType Directory -Path (Join-Path $root 'Beta') -Force | Out-Null
|
||||
Set-Content -LiteralPath (Join-Path $root 'Alpha\a.txt') 'a'
|
||||
Set-Content -LiteralPath (Join-Path $root 'Beta\b.txt') 'b'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $root 'Alpha\a.txt') 'a'
|
||||
Set-Content -Encoding UTF8 -LiteralPath (Join-Path $root 'Beta\b.txt') 'b'
|
||||
$archive = Join-Path $sandbox 'topnames.7z'
|
||||
$code = Invoke-ExternalCommand -FilePath $sevenZip -ArgumentList @('a', '-t7z', '-mx=1', '-bso0', '-bsp0', $archive, 'Alpha', 'Beta') -WorkingDirectory $root
|
||||
Assert-Equal 0 $code
|
||||
|
||||
Reference in new issue
Block a user