Skip to content

Set clean state before testing UseMU in the MSI #16543

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.

Sign up for GitHub

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

Merged
TravisEz13 merged 10 commits into from
Dec 6, 2021
Merged

Set clean state before testing UseMU in the MSI #16543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c6359f0
remove test that doesn't work due to 7.2 being installed
TravisEz13 Dec 2, 2021
df97ed9
Revert "remove test that doesn't work due to 7.2 being installed"
TravisEz13 Dec 3, 2021
5f846c7
add test to verify problem
TravisEz13 Dec 3, 2021
8bc9ace
run test when there is a test change
TravisEz13 Dec 3, 2021
73d2fc0
remove log updload before install
TravisEz13 Dec 4, 2021
f073d83
Set usemu before test
TravisEz13 Dec 4, 2021
89bb1d9
clear state before enable test
TravisEz13 Dec 4, 2021
9f48e91
fix typo
TravisEz13 Dec 4, 2021
20f64ee
update Get-UseMu function to work when reg is null
TravisEz13 Dec 4, 2021
7e8917e
Update test/packaging/windows/msi.tests.ps1
TravisEz13 Dec 6, 2021
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
1 change: 1 addition & 0 deletions .vsts-ci/windows/windows-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ pr:
- src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj
- src/Modules/PSGalleryModules.csproj
- src/powershell-win-core/powershell-win-core.csproj
- test/packaging/windows/*
- tools/ci.psm1
- tools/packaging/*

Expand Down
39 changes: 38 additions & 1 deletion test/packaging/windows/msi.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Describe -Name "Windows MSI" -Fixture {
}

function Get-UseMU {
$useMu = 0
$useMu = $null
$key = 'HKLM:\SOFTWARE\Microsoft\PowerShellCore\'
if ($runtime -like '*x86*') {
$key = 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\PowerShellCore\'
Expand All @@ -49,6 +49,25 @@ Describe -Name "Windows MSI" -Fixture {
$useMu = Get-ItemPropertyValue -Path $key -Name UseMU -ErrorAction SilentlyContinue
} catch {}

if (!$useMu) {
$useMu = 0
}

return $useMu
}

function Set-UseMU {
param(
[int]
$Value
)
$key = 'HKLM:\SOFTWARE\Microsoft\PowerShellCore\'
if ($runtime -like '*x86*') {
$key = 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\PowerShellCore\'
}

Set-ItemProperty -Path $key -Name UseMU -Value $Value -Type DWord

return $useMu
}

Expand Down Expand Up @@ -185,6 +204,15 @@ Describe -Name "Windows MSI" -Fixture {
}

Context "Add Path disabled" {
BeforeAll {
Set-UseMU -Value 0
}

It "UseMU should be 0 before install" -Skip:(!(Test-Elevated)) {
$useMu = Get-UseMU
$useMu | Should -Be 0
}

It "MSI should install without error" -Skip:(!(Test-Elevated)) {
{
Invoke-MsiExec -Install -MsiPath $msiX64Path -Properties @{ADD_PATH = 0; USE_MU = 1; ENABLE_MU = 1}
Expand Down Expand Up @@ -213,6 +241,15 @@ Describe -Name "Windows MSI" -Fixture {
}

Context "USE_MU disabled" {
BeforeAll {
Set-UseMU -Value 0
}

It "UseMU should be 0 before install" -Skip:(!(Test-Elevated)) {
$useMu = Get-UseMU
$useMu | Should -Be 0
}

It "MSI should install without error" -Skip:(!(Test-Elevated)) {
{
Invoke-MsiExec -Install -MsiPath $msiX64Path -Properties @{USE_MU = 0}
Expand Down