archives/steamos-manager
archives/steamos-manager
2
0
Fork 1
mirror of https://gitlab.steamos.cloud/holo/steamos-manager.git synced 2025-07-13 09:52:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

screenreader: Don't enable/disable unit; it can't be installed anyway

Browse source
This commit is contained in:
Vicki Pfau 2025-06-18 18:56:48 -07:00
parent a3ab918546
commit f62aa583e1
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/screenreader.rs
View file

@ -445,13 +445,11 @@ impl<'dbus> OrcaManager<'dbus> {
async fn restart_orca(&self) -> Result<()> { async fn restart_orca(&self) -> Result<()> {
trace!("Restarting orca..."); trace!("Restarting orca...");
self.orca_unit.enable().await?;
self.orca_unit.restart().await self.orca_unit.restart().await
} }
async fn stop_orca(&self) -> Result<()> { async fn stop_orca(&self) -> Result<()> {
trace!("Stopping orca..."); trace!("Stopping orca...");
self.orca_unit.disable().await?;
self.orca_unit.stop().await self.orca_unit.stop().await
} }
} }
@ -459,8 +457,7 @@ impl<'dbus> OrcaManager<'dbus> {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;
use crate::systemd::test::{MockManager, MockUnit}; use crate::systemd::test::MockUnit;
use crate::systemd::EnableState;
use crate::testing; use crate::testing;
use input_linux::{Key, KeyState}; use input_linux::{Key, KeyState};
use std::time::Duration; use std::time::Duration;
@ -483,10 +480,6 @@ mod test {
.at("/org/freedesktop/systemd1/unit/orca_2eservice", unit) .at("/org/freedesktop/systemd1/unit/orca_2eservice", unit)
.await .await
.expect("at"); .expect("at");
object_server
.at("/org/freedesktop/systemd1", MockManager::default())
.await
.expect("at");
sleep(Duration::from_millis(10)).await; sleep(Duration::from_millis(10)).await;
@ -500,12 +493,10 @@ mod test {
manager.set_enabled(true).await.unwrap(); manager.set_enabled(true).await.unwrap();
assert_eq!(manager.enabled(), true); assert_eq!(manager.enabled(), true);
assert_eq!(unit.active().await.unwrap(), true); assert_eq!(unit.active().await.unwrap(), true);
assert_eq!(unit.enabled().await.unwrap(), EnableState::Enabled);
manager.set_enabled(false).await.unwrap(); manager.set_enabled(false).await.unwrap();
assert_eq!(manager.enabled(), false); assert_eq!(manager.enabled(), false);
assert_eq!(unit.active().await.unwrap(), false); assert_eq!(unit.active().await.unwrap(), false);
assert_eq!(unit.enabled().await.unwrap(), EnableState::Disabled);
copy(TEST_ORCA_SETTINGS, h.test.path().join(ORCA_SETTINGS)) copy(TEST_ORCA_SETTINGS, h.test.path().join(ORCA_SETTINGS))
.await .await
@ -515,12 +506,10 @@ mod test {
manager.set_enabled(true).await.unwrap(); manager.set_enabled(true).await.unwrap();
assert_eq!(manager.enabled(), true); assert_eq!(manager.enabled(), true);
assert_eq!(unit.active().await.unwrap(), true); assert_eq!(unit.active().await.unwrap(), true);
assert_eq!(unit.enabled().await.unwrap(), EnableState::Enabled);
manager.set_enabled(false).await.unwrap(); manager.set_enabled(false).await.unwrap();
assert_eq!(manager.enabled(), false); assert_eq!(manager.enabled(), false);
assert_eq!(unit.active().await.unwrap(), false); assert_eq!(unit.active().await.unwrap(), false);
assert_eq!(unit.enabled().await.unwrap(), EnableState::Disabled);
} }
#[tokio::test] #[tokio::test]

2
src/systemd.rs
View file

@ -128,6 +128,7 @@ impl<'dbus> SystemdUnit<'dbus> {
Ok(()) Ok(())
} }
#[allow(unused)]
pub async fn enable(&self) -> Result<bool> { pub async fn enable(&self) -> Result<bool> {
let manager = SystemdManagerProxy::new(&self.connection).await?; let manager = SystemdManagerProxy::new(&self.connection).await?;
let (_, res) = manager let (_, res) = manager
@ -136,6 +137,7 @@ impl<'dbus> SystemdUnit<'dbus> {
Ok(!res.is_empty()) Ok(!res.is_empty())
} }
#[allow(unused)]
pub async fn disable(&self) -> Result<bool> { pub async fn disable(&self) -> Result<bool> {
let manager = SystemdManagerProxy::new(&self.connection).await?; let manager = SystemdManagerProxy::new(&self.connection).await?;
let res = manager let res = manager