diff options
| author | David Lönnhager <david.l@mullvad.net> | 2026-04-15 18:35:32 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2026-04-15 18:35:32 +0200 |
| commit | 9fc784596102c8553dbf83b9a94d2c67fc837eef (patch) | |
| tree | f450eb94210da7c03f37f9def5a3e6f05d9fdc3d | |
| parent | 640d61eefd8acd9acf4bfc5bfa359270d7372883 (diff) | |
| download | mullvadvpn-win11-test.tar.xz mullvadvpn-win11-test.zip | |
Revert "HACK! Enable VNC and keep VM running"win11-test
This reverts commit c6d16be26c625f9c0ecb2c015bbf14b55105d393.
| -rwxr-xr-x | test/scripts/utils/lib.sh | 1 | ||||
| -rw-r--r-- | test/test-manager/src/main.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/vm/qemu.rs | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/test/scripts/utils/lib.sh b/test/scripts/utils/lib.sh index 23a84b46b3..ec383fe254 100755 --- a/test/scripts/utils/lib.sh +++ b/test/scripts/utils/lib.sh @@ -222,7 +222,6 @@ function run_tests_for_os { "${upgrade_package_arg[@]}" \ "${test_report_arg[@]}" \ --package-dir "${package_dir}" \ - --vnc 5933 \ --vm "$vm" \ "${mullvad_host_arg[@]}" \ "${test_filters_arg[@]}" \ diff --git a/test/test-manager/src/main.rs b/test/test-manager/src/main.rs index 5f159163f2..0c8049c47d 100644 --- a/test/test-manager/src/main.rs +++ b/test/test-manager/src/main.rs @@ -411,7 +411,7 @@ async fn inner_main() -> Result<()> { .await .context("Tests failed"); - if display || true { + if display { instance.wait().await; } socks.close(); diff --git a/test/test-manager/src/vm/qemu.rs b/test/test-manager/src/vm/qemu.rs index 5b517b9601..5b4f43c444 100644 --- a/test/test-manager/src/vm/qemu.rs +++ b/test/test-manager/src/vm/qemu.rs @@ -23,7 +23,7 @@ use super::{VmInstance, network}; const LOG_PREFIX: &str = "[qemu] "; const STDERR_LOG_LEVEL: log::Level = log::Level::Error; const STDOUT_LOG_LEVEL: log::Level = log::Level::Debug; -const OBTAIN_IP_TIMEOUT: Duration = Duration::from_secs(360); +const OBTAIN_IP_TIMEOUT: Duration = Duration::from_secs(180); /// Default number of VCPU cores (passed to -smp) const DEFAULT_NUM_VCPUS: usize = 2; |