diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-04-08 10:50:43 +0200 |
|---|---|---|
| committer | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-04-09 11:03:32 +0200 |
| commit | 8eea4eae01061fb76ce1aac45ea296f60867b62c (patch) | |
| tree | 09455ab30579abdf1b30b9038a7626f6d280fc11 /test/test-manager/src/vm | |
| parent | 88bba34062f1efccafa52578d56601a97f8e5e2b (diff) | |
| download | mullvadvpn-8eea4eae01061fb76ce1aac45ea296f60867b62c.tar.xz mullvadvpn-8eea4eae01061fb76ce1aac45ea296f60867b62c.zip | |
Run `cargo +nightly fmt`
Diffstat (limited to 'test/test-manager/src/vm')
| -rw-r--r-- | test/test-manager/src/vm/provision.rs | 17 | ||||
| -rw-r--r-- | test/test-manager/src/vm/ssh.rs | 6 | ||||
| -rw-r--r-- | test/test-manager/src/vm/tart.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/vm/update.rs | 6 |
4 files changed, 19 insertions, 12 deletions
diff --git a/test/test-manager/src/vm/provision.rs b/test/test-manager/src/vm/provision.rs index 8667b6c133..aa8949d54f 100644 --- a/test/test-manager/src/vm/provision.rs +++ b/test/test-manager/src/vm/provision.rs @@ -1,12 +1,15 @@ -use crate::config::{OsType, Provisioner, VmConfig}; -use crate::package; +use crate::{ + config::{OsType, Provisioner, VmConfig}, + package, +}; use anyhow::{bail, Context, Result}; use ssh2::Session; -use std::fs::File; -use std::io::{self, Read}; -use std::net::IpAddr; -use std::net::TcpStream; -use std::{net::SocketAddr, path::Path}; +use std::{ + fs::File, + io::{self, Read}, + net::{IpAddr, SocketAddr, TcpStream}, + path::Path, +}; pub async fn provision( config: &VmConfig, diff --git a/test/test-manager/src/vm/ssh.rs b/test/test-manager/src/vm/ssh.rs index 008045fc2b..f75fd39c53 100644 --- a/test/test-manager/src/vm/ssh.rs +++ b/test/test-manager/src/vm/ssh.rs @@ -1,8 +1,10 @@ /// A very thin wrapper on top of `ssh2`. use anyhow::{Context, Result}; use ssh2::Session; -use std::io::Read; -use std::net::{IpAddr, SocketAddr, TcpStream}; +use std::{ + io::Read, + net::{IpAddr, SocketAddr, TcpStream}, +}; /// Default `ssh` port. const PORT: u16 = 22; diff --git a/test/test-manager/src/vm/tart.rs b/test/test-manager/src/vm/tart.rs index 1df55845ed..407a4903c2 100644 --- a/test/test-manager/src/vm/tart.rs +++ b/test/test-manager/src/vm/tart.rs @@ -63,7 +63,7 @@ pub async fn run(config: &Config, vm_config: &VmConfig) -> Result<TartInstance> } config::Display::Local => (), config::Display::Vnc => { - //tart_cmd.args(["--vnc-experimental", "--no-graphics"]); + // tart_cmd.args(["--vnc-experimental", "--no-graphics"]); tart_cmd.args(["--vnc", "--no-graphics"]); } } diff --git a/test/test-manager/src/vm/update.rs b/test/test-manager/src/vm/update.rs index ccc0c9b4a3..1d478b7fa5 100644 --- a/test/test-manager/src/vm/update.rs +++ b/test/test-manager/src/vm/update.rs @@ -1,5 +1,7 @@ -use crate::config::{OsType, PackageType, Provisioner, VmConfig}; -use crate::vm::ssh::SSHSession; +use crate::{ + config::{OsType, PackageType, Provisioner, VmConfig}, + vm::ssh::SSHSession, +}; use anyhow::{Context, Result}; use std::fmt; |
