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

power: Make test::setup return a Result

Browse source
This commit is contained in:
Vicki Pfau 2024-08-06 20:06:38 -07:00
parent 0b3a8138e1
commit 53754680c1
3 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ds_inhibit.rs
View file

@ -518,7 +518,7 @@ mod test {
drop(f); drop(f);
remove_file(path.join("proc/1/fd/3")).expect("rm"); remove_file(path.join("proc/1/fd/3")).expect("rm");
nyield(5).await; nyield(15).await;
assert_eq!( assert_eq!(
read_to_string(sys_base.join("input/input0/inhibited")).expect("inhibited"), read_to_string(sys_base.join("input/input0/inhibited")).expect("inhibited"),
"0\n" "0\n"

4
src/manager/root.rs
View file

@ -454,7 +454,7 @@ mod test {
#[tokio::test] #[tokio::test]
async fn gpu_performance_level() { async fn gpu_performance_level() {
let test = start().await.expect("start"); let test = start().await.expect("start");
power::test::setup().await; power::test::setup().await.expect("setup");
let name = test.connection.unique_name().unwrap(); let name = test.connection.unique_name().unwrap();
let proxy = GpuPerformanceLevelProxy::new(&test.connection, name.clone()) let proxy = GpuPerformanceLevelProxy::new(&test.connection, name.clone())
@ -489,7 +489,7 @@ mod test {
.await .await
.unwrap(); .unwrap();
power::test::setup().await; power::test::setup().await.expect("setup");
proxy.set_manual_gpu_clock(200).await.expect("proxy_set"); proxy.set_manual_gpu_clock(200).await.expect("proxy_set");
assert_eq!(read_clocks().await.unwrap(), format_clocks(200)); assert_eq!(read_clocks().await.unwrap(), format_clocks(200));

33
src/power.rs
View file

@ -416,19 +416,18 @@ pub(crate) mod test {
use anyhow::anyhow; use anyhow::anyhow;
use tokio::fs::{create_dir_all, read_to_string, remove_dir, write}; use tokio::fs::{create_dir_all, read_to_string, remove_dir, write};
pub async fn setup() { pub async fn setup() -> Result<()> {
// Use hwmon5 just as a test. We needed a subfolder of GPU_HWMON_PREFIX // Use hwmon5 just as a test. We needed a subfolder of GPU_HWMON_PREFIX
// and this is as good as any. // and this is as good as any.
let base = path(GPU_HWMON_PREFIX).join("hwmon5"); let base = path(GPU_HWMON_PREFIX).join("hwmon5");
let filename = base.join(GPU_PERFORMANCE_LEVEL_SUFFIX); let filename = base.join(GPU_PERFORMANCE_LEVEL_SUFFIX);
// Creates hwmon path, including device subpath // Creates hwmon path, including device subpath
create_dir_all(filename.parent().unwrap()) create_dir_all(filename.parent().unwrap())
.await .await?;
.expect("create_dir_all");
// Writes name file as addgpu so find_hwmon() will find it. // Writes name file as addgpu so find_hwmon() will find it.
write_synced(base.join("name"), GPU_HWMON_NAME.as_bytes()) write_synced(base.join("name"), GPU_HWMON_NAME.as_bytes())
.await .await?;
.expect("write_synced"); Ok(())
} }
pub async fn write_clocks(mhz: u32) { pub async fn write_clocks(mhz: u32) {
@ -466,7 +465,7 @@ CCLK_RANGE in Core0:
async fn test_get_gpu_performance_level() { async fn test_get_gpu_performance_level() {
let _h = testing::start(); let _h = testing::start();
setup().await; setup().await.expect("setup");
let base = find_hwmon().await.unwrap(); let base = find_hwmon().await.unwrap();
let filename = base.join(GPU_PERFORMANCE_LEVEL_SUFFIX); let filename = base.join(GPU_PERFORMANCE_LEVEL_SUFFIX);
assert!(get_gpu_performance_level().await.is_err()); assert!(get_gpu_performance_level().await.is_err());
@ -511,7 +510,7 @@ CCLK_RANGE in Core0:
async fn test_set_gpu_performance_level() { async fn test_set_gpu_performance_level() {
let _h = testing::start(); let _h = testing::start();
setup().await; setup().await.expect("setup");
let base = find_hwmon().await.unwrap(); let base = find_hwmon().await.unwrap();
let filename = base.join(GPU_PERFORMANCE_LEVEL_SUFFIX); let filename = base.join(GPU_PERFORMANCE_LEVEL_SUFFIX);
@ -556,7 +555,7 @@ CCLK_RANGE in Core0:
async fn test_get_tdp_limit() { async fn test_get_tdp_limit() {
let _h = testing::start(); let _h = testing::start();
setup().await; setup().await.expect("setup");
let hwmon = path(GPU_HWMON_PREFIX); let hwmon = path(GPU_HWMON_PREFIX);
assert!(get_tdp_limit().await.is_err()); assert!(get_tdp_limit().await.is_err());
@ -587,7 +586,7 @@ CCLK_RANGE in Core0:
anyhow!("No such file or directory (os error 2)").to_string() anyhow!("No such file or directory (os error 2)").to_string()
); );
setup().await; setup().await.expect("setup");
let hwmon = hwmon.join("hwmon5"); let hwmon = hwmon.join("hwmon5");
create_dir_all(hwmon.join(TDP_LIMIT1)) create_dir_all(hwmon.join(TDP_LIMIT1))
.await .await
@ -630,7 +629,7 @@ CCLK_RANGE in Core0:
let _h = testing::start(); let _h = testing::start();
assert!(get_gpu_clocks().await.is_err()); assert!(get_gpu_clocks().await.is_err());
setup().await; setup().await.expect("setup");
let base = find_hwmon().await.unwrap(); let base = find_hwmon().await.unwrap();
let filename = base.join(GPU_CLOCKS_SUFFIX); let filename = base.join(GPU_CLOCKS_SUFFIX);
@ -650,7 +649,7 @@ CCLK_RANGE in Core0:
let _h = testing::start(); let _h = testing::start();
assert!(set_gpu_clocks(1600).await.is_err()); assert!(set_gpu_clocks(1600).await.is_err());
setup().await; setup().await.expect("setup");
assert!(set_gpu_clocks(200).await.is_ok()); assert!(set_gpu_clocks(200).await.is_ok());
@ -664,7 +663,7 @@ CCLK_RANGE in Core0:
async fn test_get_gpu_clocks_range() { async fn test_get_gpu_clocks_range() {
let _h = testing::start(); let _h = testing::start();
setup().await; setup().await.expect("setup");
let base = find_hwmon().await.unwrap(); let base = find_hwmon().await.unwrap();
let filename = base.join(GPU_CLOCK_LEVELS_SUFFIX); let filename = base.join(GPU_CLOCK_LEVELS_SUFFIX);
create_dir_all(filename.parent().unwrap()) create_dir_all(filename.parent().unwrap())
@ -744,7 +743,7 @@ CCLK_RANGE in Core0:
async fn read_power_profiles() { async fn read_power_profiles() {
let _h = testing::start(); let _h = testing::start();
setup().await; setup().await.expect("setup");
let base = find_hwmon().await.unwrap(); let base = find_hwmon().await.unwrap();
let filename = base.join(GPU_POWER_PROFILE_SUFFIX); let filename = base.join(GPU_POWER_PROFILE_SUFFIX);
create_dir_all(filename.parent().unwrap()) create_dir_all(filename.parent().unwrap())
@ -800,7 +799,7 @@ CCLK_RANGE in Core0:
async fn read_unknown_power_profiles() { async fn read_unknown_power_profiles() {
let _h = testing::start(); let _h = testing::start();
setup().await; setup().await.expect("setup");
let base = find_hwmon().await.unwrap(); let base = find_hwmon().await.unwrap();
let filename = base.join(GPU_POWER_PROFILE_SUFFIX); let filename = base.join(GPU_POWER_PROFILE_SUFFIX);
create_dir_all(filename.parent().unwrap()) create_dir_all(filename.parent().unwrap())
@ -858,7 +857,7 @@ CCLK_RANGE in Core0:
async fn read_power_profile() { async fn read_power_profile() {
let _h = testing::start(); let _h = testing::start();
setup().await; setup().await.expect("setup");
let base = find_hwmon().await.unwrap(); let base = find_hwmon().await.unwrap();
let filename = base.join(GPU_POWER_PROFILE_SUFFIX); let filename = base.join(GPU_POWER_PROFILE_SUFFIX);
create_dir_all(filename.parent().unwrap()) create_dir_all(filename.parent().unwrap())
@ -896,7 +895,7 @@ CCLK_RANGE in Core0:
async fn read_no_power_profile() { async fn read_no_power_profile() {
let _h = testing::start(); let _h = testing::start();
setup().await; setup().await.expect("setup");
let base = find_hwmon().await.unwrap(); let base = find_hwmon().await.unwrap();
let filename = base.join(GPU_POWER_PROFILE_SUFFIX); let filename = base.join(GPU_POWER_PROFILE_SUFFIX);
create_dir_all(filename.parent().unwrap()) create_dir_all(filename.parent().unwrap())
@ -928,7 +927,7 @@ CCLK_RANGE in Core0:
async fn read_unknown_power_profile() { async fn read_unknown_power_profile() {
let _h = testing::start(); let _h = testing::start();
setup().await; setup().await.expect("setup");
let base = find_hwmon().await.unwrap(); let base = find_hwmon().await.unwrap();
let filename = base.join(GPU_POWER_PROFILE_SUFFIX); let filename = base.join(GPU_POWER_PROFILE_SUFFIX);
create_dir_all(filename.parent().unwrap()) create_dir_all(filename.parent().unwrap())