Skip to content

Resolve TypeTable race in live test RunspacePool #29250

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

Draft
vidai-msft wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Resolve TypeTable race in live test RunspacePool #29250

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
2 changes: 1 addition & 1 deletion src/Accounts/Accounts/Az.Accounts.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ RequiredAssemblies = 'Microsoft.Azure.PowerShell.AssemblyLoading.dll',
# ScriptsToProcess = @()

# Type files (.ps1xml) to be loaded when importing this module
# TypesToProcess = @()
TypesToProcess = 'Accounts.types.ps1xml'

# Format files (.ps1xml) to be loaded when importing this module
FormatsToProcess = 'Accounts.format.ps1xml', 'Accounts.generated.format.ps1xml'
Expand Down
4 changes: 1 addition & 3 deletions src/Accounts/Accounts/StartupScripts/AzError.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,4 @@ if (Get-Module AzureRM.profile -ErrorAction Ignore)
"If you are running in Azure Automation, take care that none of your runbooks import both Az and AzureRM modules. More information can be found here: https://aka.ms/azps-migration-guide.")
throw ("AzureRM.Profile already loaded. Az and AzureRM modules cannot be imported in the same session or used in the same script or runbook. If you are running PowerShell in an environment you control you can use the 'Uninstall-AzureRm' cmdlet to remove all AzureRm modules from your machine. " +
"If you are running in Azure Automation, take care that none of your runbooks import both Az and AzureRM modules. More information can be found here: https://aka.ms/azps-migration-guide.")
}

Update-TypeData -AppendPath (Join-Path (Get-Item $PSScriptRoot).Parent.FullName Accounts.types.ps1xml) -ErrorAction Ignore
}
4 changes: 2 additions & 2 deletions src/Storage/LiveTests/Storage.Management/FileTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Invoke-LiveTestScenario -Name "File basics" -Description "Test File basic operat
$t | Wait-Job
$t | Receive-Job

# Assert-AreEqual "Completed" $t.State
Assert-AreEqual "Completed" $t.State
Assert-Null $t.Error

# upload/remove file/dir with -DisAllowTrailingDot
Expand Down Expand Up @@ -75,7 +75,7 @@ Invoke-LiveTestScenario -Name "File basics" -Description "Test File basic operat
$t | Wait-Job
$t | Receive-Job

# Assert-AreEqual "Completed" $t.State
Assert-AreEqual "Completed" $t.State
Assert-Null $t.Error
Assert-AreEqual (Get-FileHash -Path $localDestFile -Algorithm MD5).Hash (Get-FileHash -Path $testfile512path -Algorithm MD5).Hash

Expand Down
Loading