Skip to content

Improve Start-Sleep cmdlet to accept fractional seconds #8537

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
Aditya Patwardhan (adityapatwardhan) merged 3 commits into from
Jan 14, 2019
+21 −15
Merged

Improve Start-Sleep cmdlet to accept fractional seconds #8537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37ed2f1
Improve accuracy of Start-Sleep cmdlet (#8477)
Prototyyppi Dec 24, 2018
a21c44f
Modified existing tests to test fractional seconds
Prototyyppi Dec 25, 2018
d0a8304
Wait time comment fix
Prototyyppi Dec 25, 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
6 changes: 3 additions & 3 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public void Dispose()
/// </summary>
[Parameter(Position = 0, Mandatory = true, ParameterSetName = "Seconds", ValueFromPipeline = true,
ValueFromPipelineByPropertyName = true)]
[ValidateRangeAttribute(0, int.MaxValue / 1000)]
public int Seconds { get; set; }
[ValidateRangeAttribute(0.0, (double)(int.MaxValue / 1000))]
public double Seconds { get; set; }

/// <summary>
/// Allows sleep time to be specified in milliseconds.
Expand Down Expand Up @@ -97,7 +97,7 @@ protected override void ProcessRecord()
switch (ParameterSetName)
{
case "Seconds":
sleepTime = Seconds * 1000;
sleepTime = (int)(Seconds * 1000);
break;

case "Milliseconds":
Expand Down
30 changes: 18 additions & 12 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Start-Sleep.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,48 @@
Describe "Start-Sleep DRT Unit Tests" -Tags "CI" {

# WaitHandle.WaitOne(milliseconds, exitContext) is not accurate.
# The wait time varies from 980ms to 1150ms from observation, so
# the tests here are changed to be greater than 950ms.
$minTime = 950
$maxTime = 1200
# The actual wait time can vary from 1450ms to 1700ms.
$minTime = 1450
$maxTime = 1700

It "Should work properly when sleeping with Second" {
$watch = [System.Diagnostics.Stopwatch]::StartNew()
Start-Sleep -Seconds 1
Start-Sleep -Seconds 1.5
$watch.Stop()
$watch.ElapsedMilliseconds | Should -BeGreaterThan $minTime
$watch.ElapsedMilliseconds | Should -BeLessThan $maxTime
}

It "Should work properly when sleeping with Milliseconds" {
$watch = [System.Diagnostics.Stopwatch]::StartNew()
Start-Sleep -Milliseconds 1000
Start-Sleep -Milliseconds 1500
$watch.Stop()
$watch.ElapsedMilliseconds | Should -BeGreaterThan $minTime
$watch.ElapsedMilliseconds | Should -BeLessThan $maxTime
}

It "Should work properly when sleeping with ms alias" {
$watch = [System.Diagnostics.Stopwatch]::StartNew()
Start-Sleep -ms 1000
Start-Sleep -ms 1500
$watch.Stop()
$watch.ElapsedMilliseconds | Should -BeGreaterThan $minTime
$watch.ElapsedMilliseconds | Should -BeLessThan $maxTime
}

It "Should work properly when sleeping without parameters" {
$watch = [System.Diagnostics.Stopwatch]::StartNew()
Start-Sleep 1.5
$watch.Stop()
$watch.ElapsedMilliseconds | Should -BeGreaterThan $minTime
$watch.ElapsedMilliseconds | Should -BeLessThan $maxTime
}
}

Describe "Start-Sleep" -Tags "CI" {

Context "Validate Start-Sleep works properly" {
It "Should only sleep for at least 1 second" {
$result = Measure-Command { Start-Sleep -s 1 }
$result.TotalSeconds | Should -BeGreaterThan 0.25
}
It "Should only sleep for at least 1 second" {
$result = Measure-Command { Start-Sleep -s 1 }
$result.TotalSeconds | Should -BeGreaterThan 0.25
}
}
}