admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use 'CurrentCulture' for error message and update test to clean up resources

Browse Source
This commit is contained in:
Dongbo Wang
2016-10-05 16:18:50 -07:00
committed by Dongbo Wang
parent d2feb51132
commit e078b0acb7
2 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.ConsoleHost/host/msh/StartTranscriptCmdlet.cs
+1 -1
View File
@@ -216,7 +216,7 @@ namespace Microsoft.PowerShell.Commands
else
{
string errorMessage = String.Format(
System.Globalization.CultureInfo.InvariantCulture,
System.Globalization.CultureInfo.CurrentCulture,
TranscriptStrings.TranscriptFileReadOnly,
effectiveFilePath);
Exception innerException = new ArgumentException(errorMessage);
test/powershell/Modules/Microsoft.Powershell.Host/Start-Transcript.Tests.ps1
+34 -32
View File
@@ -3,42 +3,43 @@ Describe "Start-Transcript, Stop-Transcript tests" -tags "CI" {
BeforeAll {
function ValidateTranscription {
param
(
param (
[string] $scriptToExecute,
[string] $outputFilePath,
[switch] $append,
[switch] $noClobber,
[string] $expectedError
)
if($append -or $noClobber)
{
if($append -or $noClobber) {
#Add sample text to the file
$content = "This is sample text!"
$content | Out-File -FilePath $outputFilePath
Test-Path $outputFilePath | Should be $true
}
#execute script
$ps = [powershell]::Create()
$ps.addscript($scriptToExecute).Invoke()
$ps.commands.clear()
if($expectedError)
{
$ps.hadErrors | Should be $true
$ps.Streams.Error.FullyQualifiedErrorId | Should be $expectedError
}
else
{
$ps.addscript("Get-Date").Invoke()
try {
#execute script
$ps = [powershell]::Create()
$ps.addscript($scriptToExecute).Invoke()
$ps.commands.clear()
$ps.addscript("Stop-Transcript").Invoke()
Test-Path $outputFilePath | Should be $true
$outputFilePath | should contain "Get-Date"
if($append)
{
$outputFilePath | Should contain $content
if($expectedError) {
$ps.hadErrors | Should be $true
$ps.Streams.Error.FullyQualifiedErrorId | Should be $expectedError
} else {
$ps.addscript("Get-Date").Invoke()
$ps.commands.clear()
$ps.addscript("Stop-Transcript").Invoke()
Test-Path $outputFilePath | Should be $true
$outputFilePath | should contain "Get-Date"
if($append) {
$outputFilePath | Should contain $content
}
}
} finally {
if ($ps -ne $null) {
$ps.Dispose()
}
}
}
@@ -55,19 +56,20 @@ Describe "Start-Transcript, Stop-Transcript tests" -tags "CI" {
It "Should create Transcript file at default path" {
$script = "Start-Transcript"
if ($isWindows)
{
if ($isWindows) {
$defaultTranscriptFilePath = [io.path]::Combine($env:USERPROFILE, "Documents", "PowerShell_transcript*")
}
else
{
} else {
$defaultTranscriptFilePath = [io.path]::Combine($env:HOME, "PowerShell_transcript*")
}
#Make sure there is no stale data
Remove-Item $defaultTranscriptFilePath -Force -ErrorAction SilentlyContinue
ValidateTranscription -scriptToExecute $script -outputFilePath $defaultTranscriptFilePath
#Remove test data
Remove-Item $defaultTranscriptFilePath -ErrorAction SilentlyContinue
try {
#Make sure there is no stale data
Remove-Item $defaultTranscriptFilePath -Force -ErrorAction SilentlyContinue
ValidateTranscription -scriptToExecute $script -outputFilePath $defaultTranscriptFilePath
} finally {
#Remove test data
Remove-Item $defaultTranscriptFilePath -ErrorAction SilentlyContinue
}
}
It "Should create Transcript file with 'Path' parameter" {
$script = "Start-Transcript -path $transcriptFilePath"