diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-06-04 20:34:50 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-06-04 20:34:50 +0200 |
| commit | 8e9d8d8b70f2a5515ffa4b2dad18cf5783ab1e4e (patch) | |
| tree | c2f70049be19f757f1ae6b2b80c3bfe70a47612c /nixpkgs/nixos/lib/test-driver | |
| parent | 240cb27216dbb4203e2d470d78888b5cf82809ac (diff) | |
| parent | 467ce5a9f45aaf96110b41eb863a56866e1c2c3c (diff) | |
Merge commit '467ce5a9f45aaf96110b41eb863a56866e1c2c3c'
Diffstat (limited to 'nixpkgs/nixos/lib/test-driver')
| -rw-r--r-- | nixpkgs/nixos/lib/test-driver/test-driver.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nixpkgs/nixos/lib/test-driver/test-driver.py b/nixpkgs/nixos/lib/test-driver/test-driver.py index bf46d0df97f..e7b05968b07 100644 --- a/nixpkgs/nixos/lib/test-driver/test-driver.py +++ b/nixpkgs/nixos/lib/test-driver/test-driver.py @@ -598,11 +598,8 @@ class Machine: shutil.copytree(host_src, host_intermediate) else: shutil.copy(host_src, host_intermediate) - self.succeed("sync") self.succeed(make_command(["mkdir", "-p", vm_target.parent])) self.succeed(make_command(["cp", "-r", vm_intermediate, vm_target])) - # Make sure the cleanup is synced into VM - self.succeed("sync") def copy_from_vm(self, source: str, target_dir: str = "") -> None: """Copy a file from the VM (specified by an in-VM source path) to a path @@ -620,7 +617,6 @@ class Machine: # Copy the file to the shared directory inside VM self.succeed(make_command(["mkdir", "-p", vm_shared_temp])) self.succeed(make_command(["cp", "-r", vm_src, vm_intermediate])) - self.succeed("sync") abs_target = out_dir / target_dir / vm_src.name abs_target.parent.mkdir(exist_ok=True, parents=True) # Copy the file from the shared directory outside VM @@ -628,8 +624,6 @@ class Machine: shutil.copytree(intermediate, abs_target) else: shutil.copy(intermediate, abs_target) - # Make sure the cleanup is synced into VM - self.succeed("sync") def dump_tty_contents(self, tty: str) -> None: """Debugging: Dump the contents of the TTY<n> |