-
Notifications
You must be signed in to change notification settings - Fork 913
Stop macOS startup from hanging on a stuck login shell #5333
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.
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
Open
Gabriel Dufresne (GabrielDuf)
wants to merge
3
commits into
main
Choose a base branch
from
fix/5236-macos-startup-path-hang
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+253
−16
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| using System.Diagnostics; | ||
|
|
||
| namespace UniGetUI.Core.Tools.Tests | ||
| { | ||
| public class ProcessOutputTests | ||
| { | ||
| [Fact] | ||
| public void TryReadStandardOutput_ReturnsTheCommandOutput() | ||
| { | ||
| ProcessStartInfo startInfo = OperatingSystem.IsWindows() | ||
| ? Redirected("cmd.exe", "/c", "echo", "unigetui") | ||
| : Redirected("/bin/sh", "-c", "echo unigetui"); | ||
|
|
||
| Assert.True(CoreTools.TryReadStandardOutput(startInfo, TimeSpan.FromSeconds(30), out string output)); | ||
| Assert.Equal("unigetui", output); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TryReadStandardOutput_GivesUpOnAChildThatNeverExits() | ||
| { | ||
| // #5236: a child holding stdout open (a login shell stuck in a recursive `exec zsh -l`) | ||
| // used to block ReadToEnd() forever, so the timeout was never reached. | ||
| ProcessStartInfo startInfo = OperatingSystem.IsWindows() | ||
| // A child that stays alive and silent holds stdout open exactly like the stuck | ||
| // login shell did. Sleeping avoids depending on the network stack or on stdin. | ||
| ? Redirected("powershell.exe", "-NoProfile", "-Command", "Start-Sleep", "-Seconds", "60") | ||
| : Redirected("/bin/sh", "-c", "sleep 60"); | ||
|
|
||
| var watch = Stopwatch.StartNew(); | ||
| bool succeeded = CoreTools.TryReadStandardOutput(startInfo, TimeSpan.FromSeconds(2), out string output); | ||
| watch.Stop(); | ||
|
|
||
| Assert.False(succeeded); | ||
| Assert.Equal("", output); | ||
| Assert.True(watch.Elapsed < TimeSpan.FromSeconds(30), $"Gave up after {watch.Elapsed}"); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TryReadStandardOutput_KeepsTheTotalWaitWithinTheTimeout() | ||
| { | ||
| // A child that drops stdout late but never exits used to cost a second full timeout | ||
| // waiting for the exit, so the advertised budget nearly doubled. | ||
| // Unix-only: neither cmd nor PowerShell can release their stdout handle mid-script. | ||
| if (!OperatingSystem.IsWindows()) | ||
| { | ||
| ProcessStartInfo startInfo = | ||
| Redirected("/bin/sh", "-c", "sleep 3; echo late; exec 1>&-; sleep 60"); | ||
|
|
||
| var watch = Stopwatch.StartNew(); | ||
| bool succeeded = | ||
| CoreTools.TryReadStandardOutput(startInfo, TimeSpan.FromSeconds(4), out string output); | ||
| watch.Stop(); | ||
|
|
||
| Assert.True(succeeded); | ||
| Assert.Equal("late", output); | ||
| Assert.True(watch.Elapsed < TimeSpan.FromSeconds(5.5), $"Took {watch.Elapsed}"); | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TryReadStandardOutput_StillGivesUpWhenADescendantHoldsTheOutputOpen() | ||
| { | ||
| // Worst case: the command exits at once but leaves a background process holding stdout, | ||
| // so no EOF ever arrives and the reparented descendant is beyond Kill's reach. The | ||
| // budget must still be honoured -- losing the output beats hanging on the splash. | ||
| // Unix-only: cmd and PowerShell cannot detach a child onto the same stdout handle. | ||
| if (!OperatingSystem.IsWindows()) | ||
| { | ||
| ProcessStartInfo startInfo = Redirected("/bin/sh", "-c", "echo orphaned; sleep 5 &"); | ||
|
|
||
| var watch = Stopwatch.StartNew(); | ||
| bool succeeded = | ||
| CoreTools.TryReadStandardOutput(startInfo, TimeSpan.FromSeconds(2), out string output); | ||
| watch.Stop(); | ||
|
|
||
| Assert.False(succeeded); | ||
| Assert.Equal("", output); | ||
| Assert.True(watch.Elapsed < TimeSpan.FromSeconds(4), $"Took {watch.Elapsed}"); | ||
| } | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TryReadStandardOutput_ReturnsFalseWhenTheCommandDoesNotExist() | ||
| { | ||
| Assert.False(CoreTools.TryReadStandardOutput( | ||
| Redirected("unigetui-this-command-does-not-exist"), TimeSpan.FromSeconds(30), out string output)); | ||
| Assert.Equal("", output); | ||
| } | ||
|
|
||
| private static ProcessStartInfo Redirected(string fileName, params string[] args) | ||
| { | ||
| var startInfo = new ProcessStartInfo(fileName) | ||
| { | ||
| UseShellExecute = false, | ||
| RedirectStandardOutput = true, | ||
| CreateNoWindow = true, | ||
| }; | ||
| foreach (string arg in args) | ||
| startInfo.ArgumentList.Add(arg); | ||
| return startInfo; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.