Skip to content

Move installation of test modules to bootstrapping #132

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
andyleejordan merged 1 commit into from
Feb 20, 2026
Merged

Move installation of test modules to bootstrapping #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
84 changes: 32 additions & 52 deletions test/PSDesiredStateConfiguration.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,6 @@
# Licensed under the MIT License.

BeforeDiscovery {
Function global:Install-ModuleIfMissing {
param(
[parameter(Mandatory)]
[String]
$Name,
[version]
$MinimumVersion,
[switch]
$SkipPublisherCheck,
[switch]
$Force
)

$module = Get-Module -Name $Name -ListAvailable -ErrorAction Ignore | Sort-Object -Property Version -Descending | Select-Object -First 1

if (!$module -or $module.Version -lt $MinimumVersion) {
Write-Verbose "Installing module '$Name' ..." -Verbose
Install-Module -Name $Name -Force -SkipPublisherCheck:$SkipPublisherCheck.IsPresent
}
}

Function global:Test-IsInvokeDscResourceEnable {
return ($PSVersionTable.PSVersion.Major -ge 7)
}
Expand Down Expand Up @@ -87,7 +66,6 @@ Describe "Test PSDesiredStateConfiguration" {
BeforeAll {
$origProgress = $global:ProgressPreference
$global:ProgressPreference = 'SilentlyContinue'
Install-ModuleIfMissing -Name PSDscResources
$testCases = @(
@{
TestCaseName = 'case mismatch in resource name'
Expand Down Expand Up @@ -162,10 +140,6 @@ Describe "Test PSDesiredStateConfiguration" {
$origProgress = $global:ProgressPreference
$global:ProgressPreference = 'SilentlyContinue'

Install-ModuleIfMissing -Name PSDscResources -Force

# Install PowerShellGet only if PowerShellGet 2.2.1 or newer does not exist
Install-ModuleIfMissing -Name PowerShellGet -MinimumVersion '2.2.1'
$module = Get-Module PowerShellGet -ListAvailable | Sort-Object -Property Version -Descending | Select-Object -First 1

$psGetModuleSpecification = @{ModuleName = $module.Name; ModuleVersion = $module.Version.ToString() }
Expand Down Expand Up @@ -273,7 +247,6 @@ Describe "Test PSDesiredStateConfiguration" {
BeforeAll {
$origProgress = $global:ProgressPreference
$global:ProgressPreference = 'SilentlyContinue'
Install-ModuleIfMissing -Name XmlContentDsc -Force
$classTestCases = @(
@{
TestCaseName = 'Good case'
Expand Down Expand Up @@ -340,11 +313,6 @@ Describe "Test PSDesiredStateConfiguration" {
BeforeAll {
$origProgress = $global:ProgressPreference
$global:ProgressPreference = 'SilentlyContinue'
$module = Get-InstalledModule -Name PsDscResources -ErrorAction Ignore
if ($module) {
Write-Verbose "removing PSDscResources, tests will re-install..." -Verbose
Uninstall-Module -Name PsDscResources -AllVersions -Force
}
}

AfterAll {
Expand Down Expand Up @@ -372,26 +340,22 @@ Describe "Test PSDesiredStateConfiguration" {
}
)

Install-ModuleIfMissing -Name PowerShellGet -Force -SkipPublisherCheck -MinimumVersion '2.2.1'
Install-ModuleIfMissing -Name xWebAdministration
$module = Get-Module PowerShellGet -ListAvailable | Sort-Object -Property Version -Descending | Select-Object -First 1

$psGetModuleSpecification = @{ModuleName = $module.Name; ModuleVersion = $module.Version.ToString() }
}
it "Set method should work" -Skip:(!(Test-IsInvokeDscResourceEnable)) {
if (!-not $IsWindows) {
$result = Invoke-DscResource -Name PSModule -ModuleName $psGetModuleSpecification -Method set -Property @{
Name = 'PsDscResources'
InstallationPolicy = 'Trusted'
}
if ($env:TF_BUILD -eq 'true') {
Set-ItResult -Skipped -Because "cannot install PSDscResources module during tests in Azure DevOps"
}
else {
# workraound because of https://github.com/PowerShell/PowerShellGet/pull/529
Install-ModuleIfMissing -Name PsDscResources -Force

$result = Invoke-DscResource -Name PSModule -ModuleName $psGetModuleSpecification -Method set -Property @{
Name = 'PSDscResources'
InstallationPolicy = 'Trusted'
}

$result.RebootRequired | Should -BeFalse
$module = Get-module PsDscResources -ListAvailable
$module = Get-module PSDscResources -ListAvailable
$module | Should -Not -BeNullOrEmpty -Because "Resource should have installed module"
}
it 'Set method should return RebootRequired=<expectedResult> when $global:DSCMachineStatus = <value>' -Skip:(!(Test-IsInvokeDscResourceEnable)) -TestCases $dscMachineStatusCases {
Expand All @@ -408,26 +372,38 @@ Describe "Test PSDesiredStateConfiguration" {
}

it "Test method should return false" -Skip:(!(Test-IsInvokeDscResourceEnable)) {
if ($env:TF_BUILD -eq 'true') {
Set-ItResult -Skipped -Because "cannot install PSDscResources module during tests in Azure DevOps"
}

$result = Invoke-DscResource -Name Script -ModuleName PSDscResources -Method Test -Property @{TestScript = { Write-Output 'test'; return $false }; GetScript = { return @{ } }; SetScript = { return } }
$result | Should -Not -BeNullOrEmpty
$result.InDesiredState | Should -BeFalse -Because "Test method return false"
}

it "Test method should return true" -Skip:(!(Test-IsInvokeDscResourceEnable)) {
if ($env:TF_BUILD -eq 'true') {
Set-ItResult -Skipped -Because "cannot install PSDscResources module during tests in Azure DevOps"
}

$result = Invoke-DscResource -Name Script -ModuleName PSDscResources -Method Test -Property @{TestScript = { Write-Verbose 'test'; return $true }; GetScript = { return @{ } }; SetScript = { return } }
$result | Should -BeTrue -Because "Test method return true"
}

it "Test method should return true with moduleSpecification" -Skip:(!(Test-IsInvokeDscResourceEnable)) {
$module = get-module PsDscResources -ListAvailable
if ($env:TF_BUILD -eq 'true') {
Set-ItResult -Skipped -Because "cannot install PSDscResources module during tests in Azure DevOps"
}

$module = get-module PSDscResources -ListAvailable
$moduleSpecification = @{ModuleName = $module.Name; ModuleVersion = $module.Version.ToString() }
$result = Invoke-DscResource -Name Script -ModuleName $moduleSpecification -Method Test -Property @{TestScript = { Write-Verbose 'test'; return $true }; GetScript = { return @{ } }; SetScript = { return } }
$result | Should -BeTrue -Because "Test method return true"
}

it "Invalid moduleSpecification" -Skip:(!(Test-IsInvokeDscResourceEnable)) {
Set-ItResult -Pending -Because "https://github.com/PowerShell/PSDesiredStateConfiguration/issues/17"
$moduleSpecification = @{ModuleName = 'PsDscResources'; ModuleVersion = '99.99.99.993' }
$moduleSpecification = @{ModuleName = 'PSDscResources'; ModuleVersion = '99.99.99.993' }
{
Invoke-DscResource -Name Script -ModuleName $moduleSpecification -Method Test -Property @{TestScript = { Write-Host 'test'; return $true }; GetScript = { return @{ } }; SetScript = { return } } -ErrorAction Stop
} |
Expand All @@ -439,11 +415,15 @@ Describe "Test PSDesiredStateConfiguration" {
Set-ItResult -Skipped -Because "Feature not enabled"
}

if ($env:TF_BUILD -eq 'true') {
Set-ItResult -Skipped -Because "cannot install PSDscResources module during tests in Azure DevOps"
}

$resourceName="TestRes"
$moduleName="TestEmbeddedDSCResource"
$embObj = @(New-Object -TypeName psobject -Property @{embclassprop="property1"})

Install-ModuleIfMissing -Name $moduleName -Force
Install-Module -Name $moduleName -Force

$resource = Get-DscResource -Name $resourceName -Module $moduleName -ErrorAction Stop
$resource | Should -Not -BeNullOrEmpty
Expand Down Expand Up @@ -495,17 +475,21 @@ Describe "Test PSDesiredStateConfiguration" {
}

it "Get method should work" -Skip:(!(Test-IsInvokeDscResourceEnable)) {
if ($env:TF_BUILD -eq 'true') {
Set-ItResult -Skipped -Because "cannot install PSDscResources module during tests in Azure DevOps"
}

if (-not $IsWindows) {
Set-ItResult -Pending -Because "https://github.com/PowerShell/PSDesiredStateConfiguration/issues/12 and https://github.com/PowerShell/PowerShellGet/pull/529"
}

$result = Invoke-DscResource -Name PSModule -ModuleName $psGetModuleSpecification -Method Get -Property @{ Name = 'PsDscResources' }
$result = Invoke-DscResource -Name PSModule -ModuleName $psGetModuleSpecification -Method Get -Property @{ Name = 'PSDscResources' }
$result | Should -Not -BeNullOrEmpty
$result.Author | Should -BeLike 'Microsoft*'
$result.InstallationPolicy | Should -BeOfType [string]
$result.Guid | Should -BeOfType [Guid]
$result.Ensure | Should -Be 'Present'
$result.Name | Should -be 'PsDscResources'
$result.Name | Should -be 'PSDscResources'
$result.Description | Should -BeLike 'This*DSC*'
$result.InstalledVersion | should -BeOfType [Version]
$result.ModuleBase | Should -BeLike '*PSDscResources*'
Expand All @@ -515,10 +499,6 @@ Describe "Test PSDesiredStateConfiguration" {
}

Context "Class Based Resources" {
BeforeAll {
Install-ModuleIfMissing -Name XmlContentDsc -Force
}

AfterAll {
$Global:ProgressPreference = $origProgress
}
Expand Down
6 changes: 3 additions & 3 deletions test/configuration.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Describe "DSC MOF Compilation" {
}

It "Should be able to compile a MOF using PSModule resource" {
if ($env:GITHUB_ACTIONS -eq 'true') {
Set-ItResult -Skipped -Because "Running in GitHub Actions"
if ($env:GITHUB_ACTIONS -eq 'true' -or $env:TF_BUILD -eq 'true') {
Set-ItResult -Skipped -Because "does not work in CI"
}

if (-not $IsWindows) {
Expand All @@ -24,7 +24,7 @@ Describe "DSC MOF Compilation" {
Node "localhost" {
PSModule f1
{
Name = 'PsDscResources'
Name = 'PSDscResources'
InstallationPolicy = 'Trusted'
}
}
Expand Down
12 changes: 12 additions & 0 deletions tools/installPSResources.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,16 @@ Install-PSResource -Verbose -TrustRepository -RequiredResource @{
version = "5.7.1"
repository = $PSRepository
}
PSDscResources = @{
version = "2.12.0.0"
repository = $PSRepository
}
XmlContentDsc = @{
version = "0.0.1"
repository = $PSRepository
}
xWebAdministration = @{
version = "3.3.0"
repository = $PSRepository
}
}