test-driver.py: don't leave vde1.ctl around #83598
Merged
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
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/i-cant-figure-out-how-to-use-a-nix-file-from-a-module/6452/3 |
Ma27
approved these changes
Mar 28, 2020
|
Creating these in a new tempdir sounds like a better idea - with this PR we still can't run multiple tests interactively, and if the process terminates ungracefully, we might still not clean up properly. If we create these in a temporary directory, we don't need to care ;-)
|
mmilata
changed the title
mmilata
force-pushed
the
test-driver-delete-vdectl
branch
from
9e3f084
to
c22b2c1
Compare
mmilata
changed the title
|
Updated to use tempdir, PTAL. There's extra directory level because vde changes the permissions to 777 which feels wrong in /tmp (but probably doesn't matter). |
flokli
requested changes
Mar 28, 2020
nixos/lib/test-driver/test-driver.py
Outdated
| try: | ||
| shutil.rmtree(os.path.dirname(socket)) | ||
| except Exception as e: | ||
| log.log("rmtree error: {}".format(str(e))) |
There was a problem hiding this comment.
Suggested change
| log.log("rmtree error: {}".format(str(e))) | |
| log.log("unable to rmtree socket: {}".format(str(e))) |
Send SIGTERM instead of SIGKILL to vde_switch to give it chance to delete the directories.
mmilata
force-pushed
the
test-driver-delete-vdectl
branch
from
c22b2c1
to
d4cbe04
Compare
|
@flokli actually the mode can be set by |
|
Right, even better. Thanks! |
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.
Motivation for this change
When running tests interactively, VDE control sockets are left on the filesystem, which can prevent nix-build working. Example + reproducer: https://discourse.nixos.org/t/i-cant-figure-out-how-to-use-a-nix-file-from-a-module/6452
Perhaps we can create the sockets in temporary directory to not make the tree unbuildable while the test is running?
cc @tfc