pytest-server-fixtures: Support large pids in xvfb #250
Conversation
This file contains 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
Since a large number of 64 bit distributions are now using larger PIDs than 65535 by default, and the xvfb fixtures makes the assumption that PIDs are going to be less than that, check what the maximum is, falling back to 65535 if we can't.
| @@ -43,7 +43,10 @@ class XvfbServer(object): | |||
|
|
|||
| def __init__(self): | |||
| tmpdir = mkdtemp(prefix='XvfbServer.', dir=Workspace.get_base_tempdir()) | |||
| for servernum in range(os.getpid(), 65536): | |||
| pid_max = 65536 | |||
| with open('/proc/sys/kernel/pid_max') as pid_max_file: | |||
There was a problem hiding this comment.
Is this guaranteed to exist on all Linux distributions? We should probably safely fall back to 65536 if the file doesn't exist.
There was a problem hiding this comment.
We do fall back, it's set before we open the /proc file. That /proc file was added sometime in 2.5, so it should exist, but it may throw an exception if /proc isn't mounted -- but we probably have bigger problems in that case.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Since a large number of 64 bit distributions are now using larger PIDs than 65535 by default, and the xvfb fixtures makes the assumption that PIDs are going to be less than that, check what the maximum is, falling back to 65535 if we can't.