maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change free/used calculation to be consistent across platforms

Browse source 
add a couple of tests to validate return values
This commit is contained in:
James Truher 2016-08-02 15:50:02 -07:00
parent 9597a47689
commit 1bbdaa7ea8
2 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/System.Management.Automation/engine/Types_Ps1Xml.generated.cs
View file

@ -52,29 +52,15 @@ namespace System.Management.Automation.Runspaces
if($this.Provider.ImplementingType -eq
[Microsoft.PowerShell.Commands.FileSystemProvider])
{
if ( ! $IsWindows ) {
$driveInfo = ([System.IO.DriveInfo]::GetDrives()|where-object {$_.Name -eq $this.Root}|Select-Object -first 1)
$driveInfo.TotalSize - $driveInfo.AvailableFreeSpace
}
else {
$driveRoot = ([System.IO.DirectoryInfo] $this.Root).Name.Replace('\','')
$drive = Get-CimInstance Win32_LogicalDisk -Filter ""DeviceId='$driveRoot'""
$drive.Size - $drive.FreeSpace
}
$driveInfo = [System.IO.DriveInfo]::New($this.Root)
if ( $driveInfo.IsReady ) { $driveInfo.TotalSize - $driveInfo.AvailableFreeSpace }
}"), null));
td4.Members.Add("Free",
new ScriptPropertyData(@"Free", GetScriptBlock(@"## Ensure that this is a FileSystem drive
if($this.Provider.ImplementingType -eq
[Microsoft.PowerShell.Commands.FileSystemProvider])
{
if ( ! $IsWindows ) {
([System.IO.DriveInfo]::GetDrives()|where-object {$_.Name -eq $this.Root}|Select-Object -first 1).AvailableFreeSpace
}
else {
$driveRoot = ([System.IO.DirectoryInfo] $this.Root).Root.Name.Replace('\','')
$drive = Get-CimInstance Win32_LogicalDisk -Filter ""DeviceId='$driveRoot'""
$drive.FreeSpace
}
[System.IO.DriveInfo]::New($this.Root).AvailableFreeSpace
}"), null));
yield return td4;

8
test/powershell/Modules/Microsoft.PowerShell.Management/Get-PSDrive.Tests.ps1
View file

@ -44,4 +44,12 @@ Describe "Get-PSDrive" -Tags "CI" {
!(Get-PSDrive fake -ErrorAction SilentlyContinue) | Should Be $True
Get-PSDrive fake -ErrorAction SilentlyContinue | Should BeNullOrEmpty
}
It "Should be able to determine the amount of free space of a drive" {
$dInfo = Get-PSDrive TESTDRIVE
$dInfo.Free -ge 0 | Should be $true
}
It "Should be able to determine the amount of Used space of a drive" {
$dInfo = Get-PSDrive TESTDRIVE
$dInfo.Used -ge 0 | Should be $true
}
}