colin/greetd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: Fix tests for service config

Browse Source
This commit is contained in:
Kenny Levinsen
2023-05-12 09:41:18 +02:00
parent a7c8ac89cf
commit 1b6c93cb2d
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
greetd/src/config/mod.rs
View File

@@ -162,7 +162,11 @@ fn parse_new_config(config: &HashMap<&str, HashMap<&str, &str>>) -> Result<Confi
let service = maybe_unquote(servicestr) let service = maybe_unquote(servicestr)
.map_err(|e| format!("unable to read default_session.service: {}", e))?; .map_err(|e| format!("unable to read default_session.service: {}", e))?;
Ok(ConfigSession { command, user, service }) Ok(ConfigSession {
command,
user,
service,
})
} }
None => Err("no default_session specified"), None => Err("no default_session specified"),
}?; }?;
@@ -186,7 +190,11 @@ fn parse_new_config(config: &HashMap<&str, HashMap<&str, &str>>) -> Result<Confi
let service = maybe_unquote(servicestr) let service = maybe_unquote(servicestr)
.map_err(|e| format!("unable to read initial_session.service: {}", e))?; .map_err(|e| format!("unable to read initial_session.service: {}", e))?;
Some(ConfigSession { command, user, service }) Some(ConfigSession {
command,
user,
service,
})
} }
None => None, None => None,
}; };
@@ -332,6 +340,7 @@ greeter_user = \"greeter\"
default_session: ConfigSession { default_session: ConfigSession {
command: "agreety".to_string(), command: "agreety".to_string(),
user: "greeter".to_string(), user: "greeter".to_string(),
service: "greetd-greeter".to_string(),
}, },
general: Default::default(), general: Default::default(),
initial_session: None, initial_session: None,
@@ -355,6 +364,7 @@ greeter = \"agreety\"
default_session: ConfigSession { default_session: ConfigSession {
command: "agreety".to_string(), command: "agreety".to_string(),
user: "greeter".to_string(), user: "greeter".to_string(),
service: "greetd-greeter".to_string(),
}, },
general: Default::default(), general: Default::default(),
initial_session: None, initial_session: None,
@@ -383,6 +393,7 @@ command = \"agreety\"
default_session: ConfigSession { default_session: ConfigSession {
command: "agreety".to_string(), command: "agreety".to_string(),
user: "greeter".to_string(), user: "greeter".to_string(),
service: "greetd-greeter".to_string(),
}, },
general: Default::default(), general: Default::default(),
initial_session: None, initial_session: None,
@@ -411,11 +422,13 @@ user = \"john\"
default_session: ConfigSession { default_session: ConfigSession {
command: "agreety".to_string(), command: "agreety".to_string(),
user: "greeter".to_string(), user: "greeter".to_string(),
service: "greetd-greeter".to_string(),
}, },
general: Default::default(), general: Default::default(),
initial_session: Some(ConfigSession { initial_session: Some(ConfigSession {
command: "sway".to_string(), command: "sway".to_string(),
user: "john".to_string(), user: "john".to_string(),
service: "greetd".to_string(),
}), }),
} }
); );
@@ -442,10 +455,12 @@ runfile = \"/path/to/greetd.state\"
default_session: ConfigSession { default_session: ConfigSession {
command: "agreety".to_string(), command: "agreety".to_string(),
user: "greeter".to_string(), user: "greeter".to_string(),
service: "greetd-greeter".to_string(),
}, },
general: ConfigGeneral { general: ConfigGeneral {
source_profile: false, source_profile: false,
runfile: "/path/to/greetd.state".to_string(), runfile: "/path/to/greetd.state".to_string(),
service: "greetd".to_string(),
}, },
initial_session: None, initial_session: None,
} }
@@ -484,6 +499,7 @@ vt = 1
default_session: ConfigSession { default_session: ConfigSession {
command: "agreety".to_string(), command: "agreety".to_string(),
user: "greeter".to_string(), user: "greeter".to_string(),
service: "greetd-greeter".to_string(),
}, },
general: Default::default(), general: Default::default(),
initial_session: None, initial_session: None,
@@ -507,6 +523,7 @@ vt = next
default_session: ConfigSession { default_session: ConfigSession {
command: "agreety".to_string(), command: "agreety".to_string(),
user: "greeter".to_string(), user: "greeter".to_string(),
service: "greetd-greeter".to_string(),
}, },
general: Default::default(), general: Default::default(),
initial_session: None, initial_session: None,
@@ -530,6 +547,7 @@ vt = current
default_session: ConfigSession { default_session: ConfigSession {
command: "agreety".to_string(), command: "agreety".to_string(),
user: "greeter".to_string(), user: "greeter".to_string(),
service: "greetd-greeter".to_string(),
}, },
general: Default::default(), general: Default::default(),
initial_session: None, initial_session: None,