Skip to content

Pester Test fixes #11

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
merged 2 commits into from
Aug 31, 2021
Merged

Pester Test fixes #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfa1ba7
adding loadEnvJson file for tests
bganapa Aug 31, 2021
c30c4d8
Pester Test fixes.
larisaborodina Aug 31, 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
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistry.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
if (-Not (Test-Path -Path $loadEnvPath)) {
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
}
. ($loadEnvPath)
$TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistry.Recording.json'
Expand Down
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryCapacity.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
if (-Not (Test-Path -Path $loadEnvPath)) {
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
}
. ($loadEnvPath)
$TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistryCapacity.Recording.json'
Expand Down
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryConfiguration.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
if (-Not (Test-Path -Path $loadEnvPath)) {
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
}
. ($loadEnvPath)
$TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistryConfiguration.Recording.json'
Expand Down
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistryQuota.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
if (-Not (Test-Path -Path $loadEnvPath)) {
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
}
. ($loadEnvPath)
$TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistryQuota.Recording.json'
Expand Down
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/Get-AzsContainerRegistrySetupStatus.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
if (-Not (Test-Path -Path $loadEnvPath)) {
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
}
. ($loadEnvPath)
$TestRecordingFile = Join-Path $PSScriptRoot 'Get-AzsContainerRegistrySetupStatus.Recording.json'
Expand Down
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/New-AzsContainerRegistryQuota.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
if (-Not (Test-Path -Path $loadEnvPath)) {
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
}
. ($loadEnvPath)
$TestRecordingFile = Join-Path $PSScriptRoot 'New-AzsContainerRegistryQuota.Recording.json'
Expand Down
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryConfiguration.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
if (-Not (Test-Path -Path $loadEnvPath)) {
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
}
. ($loadEnvPath)
$TestRecordingFile = Join-Path $PSScriptRoot 'Remove-AzsContainerRegistryConfiguration.Recording.json'
Expand Down
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/Remove-AzsContainerRegistryQuota.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
if (-Not (Test-Path -Path $loadEnvPath)) {
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
}
. ($loadEnvPath)
$TestRecordingFile = Join-Path $PSScriptRoot 'Remove-AzsContainerRegistryQuota.Recording.json'
Expand Down
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryConfiguration.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
if (-Not (Test-Path -Path $loadEnvPath)) {
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
}
. ($loadEnvPath)
$TestRecordingFile = Join-Path $PSScriptRoot 'Set-AzsContainerRegistryConfiguration.Recording.json'
Expand Down
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/Set-AzsContainerRegistryQuota.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
if (-Not (Test-Path -Path $loadEnvPath)) {
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
}
. ($loadEnvPath)
$TestRecordingFile = Join-Path $PSScriptRoot 'Set-AzsContainerRegistryQuota.Recording.json'
Expand Down
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Recording.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
},
"Response": {
"StatusCode": 409,
"StatusCode": 201,
"Headers": {
"Cache-Control": [ "no-cache" ],
"Pragma": [ "no-cache" ],
Expand All @@ -31,7 +31,7 @@
"Content-Type": [ "application/json; charset=utf-8" ],
"Expires": [ "-1" ]
},
"Content": "{\"error\":{\"code\":\"AcrAlreadyDeployed\",\"message\":\"Container registry deployment has already been successfully completed. It is not allowed to repeat deployment\"}}",
"Content": "{\"id\":\"/subscriptions/7e41090c-4aa7-40bc-856a-a993f8fbd215/providers/Microsoft.ContainerRegistry.Setup/locations/redmond/setup/value\",\"name\":\"redmond/value\",\"type\":\"Microsoft.ContainerRegistry.Setup/locations/setup\",\"properties\":{\"statusUri\":\"https://adminmanagement.redmond.ext-v.masd.stbtest.microsoft.com/subscriptions/731e84f5-d31e-4c6a-aa1d-546d6bfb2789/providers/Microsoft.ContainerRegistry.Setup/locations/local/setup?api-version=2019-11-01-preview\"}}",
"isContentBase64": false
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Azs.ContainerRegistry.Admin/test/Start-AzsContainerRegistrySetup.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot 'loadEnvJson.ps1'
if (-Not (Test-Path -Path $loadEnvPath)) {
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnv.ps1'
$loadEnvPath = Join-Path $PSScriptRoot '..\loadEnvJson.ps1'
}
. ($loadEnvPath)
$TestRecordingFile = Join-Path $PSScriptRoot 'Start-AzsContainerRegistrySetup.Recording.json'
Expand Down
1 change: 0 additions & 1 deletion ....ContainerRegistry.Admin/test/loadEnv.ps1 → ...tainerRegistry.Admin/test/loadEnvJson.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# limitations under the License.
# ----------------------------------------------------------------------------------
$envFile = 'env.json'
Write-Host "Loading env.json"
if ($TestMode -eq 'live') {
$envFile = 'localEnv.json'
}
Expand Down