Add test driver py copy from vm #74077
Conversation
nixos/lib/test-driver/test-driver.py
Outdated
| """Copy a file from the VM (specified by an in-VM source path) to $out | ||
| (with an optional subdirectory parameter). The file is copied via the | ||
| shared directory. |
There was a problem hiding this comment.
What about
to a path relative to
$out
via the
shared_dirshared amongst all VMs.
nixos/lib/test-driver/test-driver.py
Outdated
| int_shared_dir = pathlib.Path("/tmp/xchg") | ||
| with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td: | ||
| shared_temp = pathlib.Path(shared_td) | ||
| shared_temp_in = int_shared_dir / shared_temp.name |
There was a problem hiding this comment.
Can you inline int_shared_dir into here?
There was a problem hiding this comment.
I'd prefix paths valid inside the VM context with vm_.
nixos/lib/test-driver/test-driver.py
Outdated
| shared_temp_in = int_shared_dir / shared_temp.name | ||
| src_in = shared_temp_in / src_orig.name | ||
| src_out = shared_temp / src_orig.name | ||
| tgt = out_dir / target_dir |
There was a problem hiding this comment.
this is the absolute path of target_dir. I'd suggest to inline that or at least move if immediately before the actual copy action.
|
✨ Was just wanting a method like this. |
7c6f434c
force-pushed
the
add-test-driver-py-copy-from-vm
branch
from
277eedf
to
3e15a63
Compare
|
Added |
7c6f434c
force-pushed
the
add-test-driver-py-copy-from-vm
branch
from
87db829
to
ad38a08
Compare
|
@flokli Any opinion on my updated version? |
|
Sorry, forgot about that. LGTM. |
|
This seems to have broken sharing files between VMs -- at least it looks that way in the ceph tests. Are we supposed to use a different directory now from within the VMs? |
|
Hm, I think I saw it used as an external path to shared directory (which predictably did not work). So it should be split into two paths then? |
|
I'm actually not sure. It feels like there should be one shared directory on the host that all VMs are able to access. I don't think we have to worry about compatibility, so whether we make this directory distinct from the one used by copy probably doesn't matter. |
|
Well, when I was writing the copy code — I cannot exclude something has changed since then — I saw that |
|
Not sure I understood that, but, yes it's a problem if the variable now points to the vm-specific dirs on the host-side, whereas previously it was pointing into one directory on the host side for all VMs. |
|
When I was changing it, the variable was pointing to a directory that did not exist during the test (host-side) |
Motivation for this change
Add functionality for convenient copying from VM to
$outvia the shared dirThings done
sandboxinnix.confon non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @flokli