From 42f5157ade7dba7fc171b69fb0e7163372304b8f Mon Sep 17 00:00:00 2001 From: Sebastian Holmin Date: Wed, 22 Jan 2025 14:59:34 +0100 Subject: [PATCH 1/3] Remove duplicate log --- test/test-manager/src/tests/mod.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/test-manager/src/tests/mod.rs b/test/test-manager/src/tests/mod.rs index e2d50d0889fc..f18e8d123969 100644 --- a/test/test-manager/src/tests/mod.rs +++ b/test/test-manager/src/tests/mod.rs @@ -178,12 +178,6 @@ pub async fn set_test_location( }) .try_collect()?; - log::debug!( - "Creating custom list {} with locations '{:?}'", - test.name, - locations - ); - // Add the custom list to the current app instance // NOTE: This const is actually defined in, `mullvad_types::custom_list`, but we cannot import it. const CUSTOM_LIST_NAME_MAX_SIZE: usize = 30; From fe189f19fa6a2af01493c98ddaf123e464724908 Mon Sep 17 00:00:00 2001 From: Sebastian Holmin Date: Wed, 22 Jan 2025 15:00:19 +0100 Subject: [PATCH 2/3] Lower verbosity of logs --- test/test-manager/src/tests/helpers.rs | 4 ++-- test/test-manager/src/tests/mod.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs index 78a7cfacdf88..a63ff928b9ba 100644 --- a/test/test-manager/src/tests/helpers.rs +++ b/test/test-manager/src/tests/helpers.rs @@ -460,7 +460,7 @@ pub async fn connect_and_wait( } pub async fn disconnect_and_wait(mullvad_client: &mut MullvadProxyClient) -> Result<(), Error> { - log::debug!("Disconnecting"); + log::trace!("Disconnecting"); mullvad_client.disconnect_tunnel().await?; wait_for_tunnel_state(mullvad_client.clone(), |state| { @@ -468,7 +468,7 @@ pub async fn disconnect_and_wait(mullvad_client: &mut MullvadProxyClient) -> Res }) .await?; - log::debug!("Disconnected"); + log::trace!("Disconnected"); Ok(()) } diff --git a/test/test-manager/src/tests/mod.rs b/test/test-manager/src/tests/mod.rs index f18e8d123969..19d305a8a34f 100644 --- a/test/test-manager/src/tests/mod.rs +++ b/test/test-manager/src/tests/mod.rs @@ -183,7 +183,7 @@ pub async fn set_test_location( const CUSTOM_LIST_NAME_MAX_SIZE: usize = 30; let mut custom_list_name = test.name.to_string(); custom_list_name.truncate(CUSTOM_LIST_NAME_MAX_SIZE); - log::debug!("Creating custom list {custom_list_name} with locations '{locations:?}'"); + log::debug!("Creating custom list `{custom_list_name}` with locations '{locations:?}'"); let list_id = mullvad_client .create_custom_list(custom_list_name.clone()) @@ -196,7 +196,7 @@ pub async fn set_test_location( custom_list.locations.insert(location); } mullvad_client.update_custom_list(custom_list).await?; - log::debug!("Added custom list"); + log::trace!("Added custom list"); set_location(mullvad_client, LocationConstraint::CustomList { list_id }) .await From 04b3d9cccc45f4038dea99d0813c102ab194aaf3 Mon Sep 17 00:00:00 2001 From: Sebastian Holmin Date: Wed, 22 Jan 2025 15:11:14 +0100 Subject: [PATCH 3/3] Add copy of current test location to `config.md` --- test/test-manager/docs/config.md | 85 +++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 30 deletions(-) diff --git a/test/test-manager/docs/config.md b/test/test-manager/docs/config.md index 09d4f110cec5..2f9f952d0788 100644 --- a/test/test-manager/docs/config.md +++ b/test/test-manager/docs/config.md @@ -47,6 +47,25 @@ The above example will set the locations for the test `test_daita` to a custom l containing `se-got-wg-001` and `se-got-wg-002`. The `*` is a wildcard that will match any test name. The configuration is read from top-to-bottom, and the first match will be used. +### Test location currently used by the GitHub end to end-test workflow + +Below is a copy of the test location setting currently used by the machines that +run the GitHub workflow for desktop end to end tests. Make sure to keep it updated! + +```json +{ + "test_locations": [ + { "test_wireguard_over_shadowsocks": ["se-got"] }, + { "test_multihop": ["se-got"] }, + { "test_quantum_resistant_tunnel": ["se-got"] }, + { "test_quantum_resistant_multihop_udp2tcp_tunnel": ["se-got"] }, + { "test_quantum_resistant_multihop_shadowsocks_tunnel": ["se-got"] }, + { "test_ui_tunnel_settings": ["se-got"] }, + { "*": ["se", "no", "fi", "dk"] } + ] +} +``` + ## Example configurations ### Minimal @@ -66,36 +85,42 @@ A configuration containing one Debian 12 VM and one Windows 11 VM ```json { - "mullvad_host": "stagemole.eu", - "vms": { - "debian12": { - "vm_type": "qemu", - "image_path": "$VM_IMAGES/debian12.qcow2", - "os_type": "linux", - "package_type": "deb", - "architecture": "x64", - "provisioner": "ssh", - "ssh_user": "test", - "ssh_password": "test", - "disks": [], - "artifacts_dir": "/opt/testing", - "tpm": false - }, - "windows11": { - "vm_type": "qemu", - "image_path": "$VM_IMAGES/windows11.qcow2", - "os_type": "windows", - "package_type": null, - "architecture": "x64", - "provisioner": "noop", - "ssh_user": null, - "ssh_password": null, - "disks": [ - "$TESTRUNNER_IMAGES/windows-test-runner.img" - ], - "artifacts_dir": "E:\\", - "tpm": false - } + "test_locations": [ + { "test_wireguard_over_shadowsocks": ["se-got"] }, + { "test_multihop": ["se-got"] }, + { "test_quantum_resistant_tunnel": ["se-got"] }, + { "test_quantum_resistant_multihop_udp2tcp_tunnel": ["se-got"] }, + { "test_quantum_resistant_multihop_shadowsocks_tunnel": ["se-got"] }, + { "test_ui_tunnel_settings": ["se-got"] }, + { "*": ["se", "no", "fi", "dk"] } + ], + "mullvad_host": "stagemole.eu", + "vms": { + "debian12": { + "vm_type": "qemu", + "image_path": "$VM_IMAGES/debian12.qcow2", + "os_type": "linux", + "package_type": "deb", + "architecture": "x64", + "provisioner": "ssh", + "ssh_user": "test", + "ssh_password": "test", + "disks": [], + "artifacts_dir": "/opt/testing", + "tpm": false + }, + "windows11": { + "vm_type": "qemu", + "image_path": "$VM_IMAGES/windows11.qcow2", + "os_type": "windows", + "package_type": null, + "architecture": "x64", + "provisioner": "noop", + "ssh_user": null, + "ssh_password": null, + "disks": ["$TESTRUNNER_IMAGES/windows-test-runner.img"], + "artifacts_dir": "E:\\", + "tpm": false } } }