Skip to content

Throw terminating error in New-TemporaryFile and make it not rely on the presence of the 'TEMP' environment variable #6182

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
iSazonov merged 9 commits into from
Feb 22, 2018
Merged

Throw terminating error in New-TemporaryFile and make it not rely on the presence of the 'TEMP' environment variable #6182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f6afd99
new-temporary file to throw terminating error and other improvements
bergmeister Feb 18, 2018
11c5356
handle null in test cleanup
bergmeister Feb 18, 2018
b37e1aa
fix help about help uri and remove rather pathetic test
bergmeister Feb 18, 2018
0a3b51a
make help uri culture invariant
bergmeister Feb 18, 2018
ff44545
revert updated help link and test syntax
bergmeister Feb 18, 2018
3a06e91
Merge branch 'master' of https://github.com/PowerShell/PowerShell int…
bergmeister Feb 19, 2018
03ce79c
simplify test as discussed in PR.
bergmeister Feb 21, 2018
a5b2654
fix indentation and brace
bergmeister Feb 21, 2018
ec4b148
add additional assertion for base path to be temo oath
bergmeister Feb 22, 2018
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
8 changes: 4 additions & 4 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTemporaryFileCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ public class NewTemporaryFileCommand : Cmdlet
protected override void EndProcessing()
{
string filePath = null;
string tempPath = System.Environment.GetEnvironmentVariable("TEMP");
string tempPath = Path.GetTempPath();
if (ShouldProcess(tempPath))
{
try
{
filePath = Path.GetTempFileName();
}
catch (Exception e)
catch (IOException ioException)
{
WriteError(
ThrowTerminatingError(
new ErrorRecord(
e,
ioException,
"NewTemporaryFileWriteError",
ErrorCategory.WriteError,
tempPath));
Expand Down
8 changes: 4 additions & 4 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/NewTemporaryFile.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
A FileInfo object for the temporary file is returned.
#>

Describe "NewTemporaryFile" -Tags "CI" {
Describe "New-TemporaryFile" -Tags "CI" {

It "creates a new temporary file" {
$tempFile = New-TemporaryFile

Test-Path $tempFile | Should be $true
$tempFile | Should Exist
Copy link
Member

@SteveL-MSFT SteveL-MSFT Feb 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From a black box testing point of view, it seems that we should check that the $tempFile path starts with the path returned from GetTempPath()?

Copy link
Contributor Author

@bergmeister bergmeister Feb 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could... Would you be ok with this one:

$tempFile | Should BeLikeExactly "$([System.IO.Path]::GetTempPath())*"

$tempFile | Should BeOfType System.IO.FileInfo
$tempFile | Should BeLikeExactly "$([System.IO.Path]::GetTempPath())*"

if(Test-Path $tempFile)
{
if (Test-Path $tempFile) {
Remove-Item $tempFile -ErrorAction SilentlyContinue -Force
}
}
Expand Down