From 4ea2a523c990dbe22c0f76aa6980b94254994cd5 Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Thu, 21 Mar 2024 13:02:49 +0000 Subject: [PATCH] Fix tests --- rust/agama-server/tests/network.rs | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/rust/agama-server/tests/network.rs b/rust/agama-server/tests/network.rs index e437331d9d..92c8906afc 100644 --- a/rust/agama-server/tests/network.rs +++ b/rust/agama-server/tests/network.rs @@ -8,7 +8,7 @@ use agama_lib::network::{ }; use agama_server::network::{ self, - model::{self, Ipv4Method, Ipv6Method}, + model::{self, GeneralState, Ipv4Method, Ipv6Method, NetworkStateItems}, Adapter, NetworkAdapterError, NetworkService, NetworkState, }; use async_trait::async_trait; @@ -21,7 +21,10 @@ pub struct NetworkTestAdapter(network::NetworkState); #[async_trait] impl Adapter for NetworkTestAdapter { - async fn read(&self) -> Result { + async fn read( + &self, + items: Vec, + ) -> Result { Ok(self.0.clone()) } @@ -34,12 +37,18 @@ impl Adapter for NetworkTestAdapter { async fn test_read_connections() -> Result<(), Box> { let mut server = DBusServer::new().start().await?; + let general_state = GeneralState { + wireless_enabled: false, + connectivity: true, + networking_enabled: true, + }; + let device = model::Device { name: String::from("eth0"), type_: DeviceType::Ethernet, }; let eth0 = model::Connection::new("eth0".to_string(), DeviceType::Ethernet); - let state = NetworkState::new(vec![device], vec![eth0]); + let state = NetworkState::new(general_state, vec![], vec![device], vec![eth0]); let adapter = NetworkTestAdapter(state); NetworkService::start(&server.connection(), adapter).await?; @@ -143,12 +152,18 @@ async fn test_add_bond_connection() -> Result<(), Box> { async fn test_update_connection() -> Result<(), Box> { let mut server = DBusServer::new().start().await?; + let general_state = GeneralState { + wireless_enabled: false, + connectivity: true, + networking_enabled: true, + }; + let device = model::Device { name: String::from("eth0"), type_: DeviceType::Ethernet, }; let eth0 = model::Connection::new("eth0".to_string(), DeviceType::Ethernet); - let state = NetworkState::new(vec![device], vec![eth0]); + let state = NetworkState::new(general_state, vec![], vec![device], vec![eth0]); let adapter = NetworkTestAdapter(state); NetworkService::start(&server.connection(), adapter).await?;