Skip to content

Commit ebad0c3

Browse files
Fix tests
1 parent 0899e49 commit ebad0c3

2 files changed

Lines changed: 18 additions & 7 deletions

File tree

test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,14 @@ Describe 'Test HTTP Find-PSResource for ACR Server Protocol' -tags 'CI' {
274274

275275
Describe 'Test Find-PSResource for MAR Repository' -tags 'CI' {
276276

277+
BeforeAll {
278+
Get-NewPSResourceRepositoryFile
279+
}
280+
281+
AfterAll {
282+
Get-RevertPSResourceRepositoryFile
283+
}
284+
277285
It "Should find resource given specific Name, Version null" {
278286
$res = Find-PSResource -Name "Az.Accounts" -Repository "MAR"
279287
$res.Name | Should -Be "Az.Accounts"

test/ResourceRepositoryTests/MARRepository.Tests.ps1

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Describe "Test MAR Repository Registration" -tags 'CI' {
7777

7878
Context "Reset repository store includes MAR" {
7979
It "Reset-PSResourceRepository should register MAR alongside PSGallery" {
80-
Reset-PSResourceRepository
80+
Reset-PSResourceRepository -Confirm:$false
8181
$res = Get-PSResourceRepository -Name $MARName
8282
$res | Should -Not -BeNullOrEmpty
8383
$res.Name | Should -Be $MARName
@@ -95,7 +95,7 @@ Describe "Test MAR Repository Registration" -tags 'CI' {
9595
$res = Get-PSResourceRepository -Name $MARName -ErrorAction SilentlyContinue
9696
$res | Should -BeNullOrEmpty
9797

98-
Reset-PSResourceRepository
98+
Reset-PSResourceRepository -Confirm:$false
9999
$res = Get-PSResourceRepository -Name $MARName
100100
$res | Should -Not -BeNullOrEmpty
101101
$res.Name | Should -Be $MARName
@@ -107,7 +107,7 @@ Describe "Test MAR Repository Registration" -tags 'CI' {
107107
It "Reset-PSResourceRepository should restore both PSGallery and MAR" {
108108
Unregister-PSResourceRepository -Name $MARName
109109
Unregister-PSResourceRepository -Name $PSGalleryName
110-
Reset-PSResourceRepository
110+
Reset-PSResourceRepository -Confirm:$false
111111

112112
$mar = Get-PSResourceRepository -Name $MARName
113113
$mar | Should -Not -BeNullOrEmpty
@@ -125,15 +125,18 @@ Describe "Test MAR Repository Registration" -tags 'CI' {
125125
It "Find-PSResource Az.Accounts module from MAR" {
126126
$res = Find-PSResource -Name "Az.Accounts"
127127
$res | Should -Not -BeNullOrEmpty
128-
$res.Name | Should -Be "Az.Accounts"
129-
$res.Repository | Should -Be $MARName
128+
$res.Count | Should -BeGreaterThan 0
129+
$firstRes = $res | Select-Object -First 1
130+
$firstRes.Name | Should -Be "Az.Accounts"
131+
$firstRes.Repository | Should -Be $MARName
130132
}
131133

132134
It 'Find-PSResource fallback to PSGallery if module not in MAR' {
133135
$res = Find-PSResource -Name "Pscx"
134136
$res | Should -Not -BeNullOrEmpty
135-
$res.Name | Should -Be "Pscx"
136-
$res.Repository | Should -Be $PSGalleryName
137+
$firstRes = $res | Select-Object -First 1
138+
$firstRes.Name | Should -Be "Pscx"
139+
$firstRes.Repository | Should -Be $PSGalleryName
137140
}
138141
}
139142
}

0 commit comments

Comments
 (0)