Skip to content

Fix WindowsPowerShell test automation #8731

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.

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
Mar 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,14 @@ public void IdentityProviderCrudTest()

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TenantGitConfigurationCrudTest()
public void TenantGitConfCrudTest()
{
RunPowerShellTest("TenantGitConfiguration-CrudTest");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TenantAccessConfigurationCrudTest()
public void TenantAccessConfCrudTest()
{
RunPowerShellTest("TenantAccessConfiguration-CrudTest");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public void TestSimpleNewVmssWithSystemAssignedIdentity()

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.RunType, Category.CoreOnly)]
public void TestSimpleNewVmssImageName()
{
TestRunner.RunTestScript("Test-SimpleNewVmssImageName");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Test New-AzIntegrationAccountAgreement command
#>
function Test-CreateIntegrationAccountAgreementX12
{
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down Expand Up @@ -65,7 +65,7 @@ Test New-AzIntegrationAccountAgreement command
#>
function Test-CreateIntegrationAccountAgreementAS2
{
$agreementAS2FilePath = Join-Path $TestOutputRoot "Resources" "AS2AgreementContent.json"
$agreementAS2FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "AS2AgreementContent.json"
$agreementAS2Content = [IO.File]::ReadAllText($agreementAS2FilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down Expand Up @@ -98,7 +98,7 @@ Test New-AzIntegrationAccountAgreement command
#>
function Test-CreateIntegrationAccountAgreementEdifact
{
$agreementEdifactFilePath = Join-Path $TestOutputRoot "Resources" "EdifactAgreementContent.json"
$agreementEdifactFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "EdifactAgreementContent.json"
$agreementEdifactContent = [IO.File]::ReadAllText($agreementEdifactFilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down Expand Up @@ -132,7 +132,7 @@ Test New-AzIntegrationAccountAgreement command with negative scenario.
#>
function Test-CreateIntegrationAccountAgreementWithFailure
{
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down Expand Up @@ -166,7 +166,7 @@ Test Get-AzIntegrationAccountAgreement command
#>
function Test-GetIntegrationAccountAgreement
{
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

Assert-ThrowsContains { Get-AzIntegrationAccountAgreement -ResourceGroupName "Random83da135" -IntegrationAccountName "DoesNotMatter" -AgreementName "DoesNotMatter" } "Resource group 'Random83da135' could not be found."
Expand Down Expand Up @@ -202,7 +202,7 @@ Test Remove-AzIntegrationAccountAgreement command
#>
function Test-RemoveIntegrationAccountAgreement
{
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down Expand Up @@ -232,10 +232,10 @@ Test Set-AzIntegrationAccountAgreement command
#>
function Test-UpdateIntegrationAccountAgreement
{
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

$agreementAS2FilePath = Join-Path $TestOutputRoot "Resources" "AS2AgreementContent.json"
$agreementAS2FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "AS2AgreementContent.json"
$agreementAS2Content = [IO.File]::ReadAllText($agreementAS2FilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down Expand Up @@ -317,7 +317,7 @@ Test Get-AzIntegrationAccountAgreement command : paging test
#>
function Test-ListIntegrationAccountAgreement
{
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Test New-AzIntegrationAccountAssembly command
#>
function Test-NewIntegrationAccountAssembly
{
$localAssemblyFilePath = Join-Path $TestOutputRoot "Resources" "SampleAssembly.dll"
$localAssemblyFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleAssembly.dll"
$assemblyContent = [IO.File]::ReadAllBytes($localAssemblyFilePath)
$resourceGroup = TestSetup-CreateResourceGroup
$integrationAccountName = "IA-" + (getAssetname)
Expand Down Expand Up @@ -75,7 +75,7 @@ Test Get-AzIntegrationAccountAssembly command
#>
function Test-GetIntegrationAccountAssembly
{
$localAssemblyFilePath = Join-Path $TestOutputRoot "Resources" "SampleAssembly.dll"
$localAssemblyFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleAssembly.dll"
$resourceGroup = TestSetup-CreateResourceGroup
$integrationAccountName = "IA-" + (getAssetname)
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
Expand Down Expand Up @@ -116,7 +116,7 @@ Test Remove-AzIntegrationAccountAssembly command
#>
function Test-RemoveIntegrationAccountAssembly
{
$localAssemblyFilePath = Join-Path $TestOutputRoot "Resources" "SampleAssembly.dll"
$localAssemblyFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleAssembly.dll"
$resourceGroup = TestSetup-CreateResourceGroup
$integrationAccountName = "IA-" + (getAssetname)
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
Expand Down Expand Up @@ -146,7 +146,7 @@ Test Set-AzIntegrationAccountAssembly command
#>
function Test-SetIntegrationAccountAssembly
{
$localAssemblyFilePath = Join-Path $TestOutputRoot "Resources" "SampleAssembly.dll"
$localAssemblyFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleAssembly.dll"
$assemblyContent = [IO.File]::ReadAllBytes($localAssemblyFilePath)
$resourceGroup = TestSetup-CreateResourceGroup
$integrationAccountName = "IA-" + (getAssetname)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Test New-AzIntegrationAccountBatchConfiguration command
#>
function Test-NewIntegrationAccountBatchConfiguration
{
$batchConfigurationFilePath = Join-Path $TestOutputRoot "Resources" "SampleBatchConfiguration.json"
$batchConfigurationFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleBatchConfiguration.json"
$batchConfigurationContent = [IO.File]::ReadAllText($batchConfigurationFilePath)
$resourceGroup = TestSetup-CreateResourceGroup
$integrationAccountName = "IA-" + (getAssetname)
Expand Down Expand Up @@ -74,7 +74,7 @@ Test Get-AzIntegrationAccountBatchConfiguration command
#>
function Test-GetIntegrationAccountBatchConfiguration
{
$batchConfigurationFilePath = Join-Path $TestOutputRoot "Resources" "SampleBatchConfiguration.json"
$batchConfigurationFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleBatchConfiguration.json"
$resourceGroup = TestSetup-CreateResourceGroup
$integrationAccountName = "IA-" + (getAssetname)
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
Expand Down Expand Up @@ -115,7 +115,7 @@ Test Remove-AzIntegrationAccountBatchConfiguration command
#>
function Test-RemoveIntegrationAccountBatchConfiguration
{
$batchConfigurationFilePath = Join-Path $TestOutputRoot "Resources" "SampleBatchConfiguration.json"
$batchConfigurationFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleBatchConfiguration.json"
$resourceGroup = TestSetup-CreateResourceGroup
$integrationAccountName = "IA-" + (getAssetname)
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
Expand Down Expand Up @@ -145,7 +145,7 @@ Test Set-AzIntegrationAccountBatchConfiguration command
#>
function Test-SetIntegrationAccountBatchConfiguration
{
$batchConfigurationFilePath = Join-Path $TestOutputRoot "Resources" "SampleBatchConfiguration.json"
$batchConfigurationFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleBatchConfiguration.json"
$batchConfigurationContent = [IO.File]::ReadAllText($batchConfigurationFilePath)
$resourceGroup = TestSetup-CreateResourceGroup
$integrationAccountName = "IA-" + (getAssetname)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function Test-CreateIntegrationAccountCertificate

$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName

$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"
$certFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "IntegrationAccountCertificate.cer"

$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificate.Name
Expand Down Expand Up @@ -65,7 +65,7 @@ function Test-CreateIntegrationAccountCertificatePublicKey

$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName

$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"
$certFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "IntegrationAccountCertificate.cer"

$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1"
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificate.Name
Expand All @@ -86,7 +86,7 @@ function Test-UpdateIntegrationAccountCertificate

$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName

$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"
$certFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "IntegrationAccountCertificate.cer"

$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificate.Name
Expand Down Expand Up @@ -119,7 +119,7 @@ function Test-GetIntegrationAccountCertificate

$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName

$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"
$certFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "IntegrationAccountCertificate.cer"

New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath

Expand All @@ -145,7 +145,7 @@ function Test-RemoveIntegrationAccountCertificate

$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName

$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"
$certFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "IntegrationAccountCertificate.cer"

New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Test New-AzIntegrationAccountMap command
#>
function Test-CreateIntegrationAccountMap
{
$xslt1FilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt1Map.xslt"
$xslt2FilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt2Map.xslt"
$xslt3FilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt3Map.xslt"
$liquidFilePath = Join-Path $TestOutputRoot "Resources" "SampleLiquidMap.liquid"
$xslt1FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
$xslt2FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt2Map.xslt"
$xslt3FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt3Map.xslt"
$liquidFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleLiquidMap.liquid"
$xslt1MapContent = [IO.File]::ReadAllText($xslt1FilePath)
$xslt2MapContent = [IO.File]::ReadAllText($xslt2FilePath)
$xslt3MapContent = [IO.File]::ReadAllText($xslt3FilePath)
Expand Down Expand Up @@ -67,7 +67,7 @@ Test Get-AzIntegrationAccountMap command
#>
function Test-GetIntegrationAccountMap
{
$mapFilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt1Map.xslt"
$mapFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
$mapContent = [IO.File]::ReadAllText($mapFilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down Expand Up @@ -96,7 +96,7 @@ Test Remove-AzIntegrationAccountMap command
#>
function Test-RemoveIntegrationAccountMap
{
$mapFilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt1Map.xslt"
$mapFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
$mapContent = [IO.File]::ReadAllText($mapFilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand All @@ -120,7 +120,7 @@ Test Set-AzIntegrationAccountMap command
#>
function Test-UpdateIntegrationAccountMap
{
$mapFilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt1Map.xslt"
$mapFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
$mapContent = [IO.File]::ReadAllText($mapFilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down Expand Up @@ -148,7 +148,7 @@ Test Get-AzIntegrationAccountMap command : Paging test
#>
function Test-ListIntegrationAccountMap
{
$mapFilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt1Map.xslt"
$mapFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
$mapContent = [IO.File]::ReadAllText($mapFilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Test New-AzIntegrationAccountSchema command
#>
function Test-CreateIntegrationAccountSchema
{
$schemaFilePath = Join-Path $TestOutputRoot "Resources" "OrderFile.xsd"
$schemaFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "OrderFile.xsd"
$schemaContent = [IO.File]::ReadAllText($schemaFilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down Expand Up @@ -48,7 +48,7 @@ Test Get-AzIntegrationAccountSchema command
#>
function Test-GetIntegrationAccountSchema
{
$schemaFilePath = Join-Path $TestOutputRoot "Resources" "OrderFile.xsd"
$schemaFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "OrderFile.xsd"
$schemaContent = [IO.File]::ReadAllText($schemaFilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down Expand Up @@ -77,7 +77,7 @@ Test Remove-AzIntegrationAccountSchema command
#>
function Test-RemoveIntegrationAccountSchema
{
$schemaFilePath = Join-Path $TestOutputRoot "Resources" "OrderFile.xsd"
$schemaFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "OrderFile.xsd"
$schemaContent = [IO.File]::ReadAllText($schemaFilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand All @@ -101,7 +101,7 @@ Test Set-AzIntegrationAccountSchema command
#>
function Test-UpdateIntegrationAccountSchema
{
$schemaFilePath = Join-Path $TestOutputRoot "Resources" "OrderFile.xsd"
$schemaFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "OrderFile.xsd"
$schemaContent = [IO.File]::ReadAllText($schemaFilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down Expand Up @@ -129,7 +129,7 @@ Test Get-AzIntegrationAccountSchema command : Paging test
#>
function Test-ListIntegrationAccountSchema
{
$schemaFilePath = Join-Path $TestOutputRoot "Resources" "OrderFile.xsd"
$schemaFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "OrderFile.xsd"
$schemaContent = [IO.File]::ReadAllText($schemaFilePath)

$resourceGroup = TestSetup-CreateResourceGroup
Expand Down
Loading