test: catch correct exception in memory.py #5041
Merged
Conversation
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
The access to the `firecracker_pid` property causes a read to the vm's pid file. This means that in the scenario where the VM is already dead by the time the monitor starts running, we won't get a `NoSuchProcess` error, we potentially get a `FileNotFoundError` (if the jail is already cleaned up). Thus, to avoid spurious failures, also catch `FileNotFoundError`. We leave the catch for `NoSuchProcess` error in case a VM exits between reading the pid file and the call to the`psutils.Process` constructor (race condition). Signed-off-by: Patrick Roy <roypat@amazon.co.uk>
Running the sandbox command leaves the .ipython folder as owned by root. Fix this up after exiting so that its can be accesses un-privileged after docker exits (I have a git pre-commit hook that tries to stash all unstaged changes, and it always chokes on this folder). Signed-off-by: Patrick Roy <roypat@amazon.co.uk>
Because we're storing dmesg in a local variable, if an exception occurs while killing a microvm, python will end up printing the entirety of the host dmesg output to stderr, because it dumps local variables as part of the backtrace. This is fine in CI because instances are shortlived, but when running tests locally, it takes my terminal multiple minutes to catch up with the amount of text that ends up being printed. Fix this by not storing dmesg in a local variable anymore, and instead inline it to its only use-site. Signed-off-by: Patrick Roy <roypat@amazon.co.uk>
roypat
added
the
Status: Awaiting review
pb8o
approved these changes
Feb 14, 2025
pb8o
reviewed
Feb 14, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #5041 +/- ##
=======================================
Coverage 83.21% 83.21%
=======================================
Files 245 245
Lines 26626 26626
=======================================
Hits 22156 22156
Misses 4470 4470
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
kalyazin
approved these changes
Feb 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The access to the
firecracker_pidproperty causes a read to the vm'spid file. This means that in the scenario where the VM is already dead
by the time the monitor starts running, we won't get a
NoSuchProcesserror, we potentially get a
FileNotFoundError(if the jail is alreadycleaned up). Thus, to avoid spurious failures, also catch
FileNotFoundError.We leave the catch for
NoSuchProcesserror in case a VM exits betweenreading the pid file and the call to the
psutils.Processconstructor(race condition).
Signed-off-by: Patrick Roy roypat@amazon.co.uk## Changes
...
Reason
...
License Acceptance
By submitting this pull request, I confirm that my contribution is made under
the terms of the Apache 2.0 license. For more information on following Developer
Certificate of Origin and signing off your commits, please check
CONTRIBUTING.md.PR Checklist
tools/devtool checkstyleto verify that the PR passes theautomated style checks.
how they are solving the problem in a clear and encompassing way.
in the PR.
CHANGELOG.md.Runbook for Firecracker API changes.
integration tests.
TODO.rust-vmm.