robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 17:14:08 +02:00
Code Issues Projects Releases Wiki Activity

fix tests

Browse source
This commit is contained in:
Robin Appelman 2026-03-10 14:09:11 +01:00
commit 87de2dbb21
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/cloud.rs
View file

@ -152,44 +152,44 @@ fn test_option_parse() {
..Default::default() ..Default::default()
} }
); );
let mut args = vec!["7"].into_iter().peekable(); let mut args = vec!["8"].into_iter().peekable();
assert_eq!( assert_eq!(
CloudOptions::parse(&config, &mut args).unwrap(), CloudOptions::parse(&config, &mut args).unwrap(),
CloudOptions { CloudOptions {
php: PhpVersion::Php74, php: PhpVersion::Php80,
..Default::default() ..Default::default()
} }
); );
let mut args = vec!["7", "pgsql", "rest"].into_iter().peekable(); let mut args = vec!["8.1", "pgsql", "rest"].into_iter().peekable();
assert_eq!( assert_eq!(
CloudOptions::parse(&config, &mut args).unwrap(), CloudOptions::parse(&config, &mut args).unwrap(),
CloudOptions { CloudOptions {
php: PhpVersion::Php74, php: PhpVersion::Php81,
db: Database::Postgres, db: Database::Postgres,
..Default::default() ..Default::default()
} }
); );
let mut args = vec!["7", "ldap", "pgsql"].into_iter().peekable(); let mut args = vec!["8", "ldap", "pgsql"].into_iter().peekable();
assert_eq!( assert_eq!(
CloudOptions::parse(&config, &mut args).unwrap(), CloudOptions::parse(&config, &mut args).unwrap(),
CloudOptions { CloudOptions {
php: PhpVersion::Php74, php: PhpVersion::Php80,
db: Database::Postgres, db: Database::Postgres,
services: vec![Service::Ldap(Ldap), Service::LdapAdmin(LdapAdmin)], services: vec![Service::Ldap(Ldap), Service::LdapAdmin(LdapAdmin)],
..Default::default() ..Default::default()
} }
); );
let mut args = vec!["7", "pgsql", "ldap"].into_iter().peekable(); let mut args = vec!["8", "pgsql", "ldap"].into_iter().peekable();
assert_eq!( assert_eq!(
CloudOptions::parse(&config, &mut args).unwrap(), CloudOptions::parse(&config, &mut args).unwrap(),
CloudOptions { CloudOptions {
php: PhpVersion::Php74, php: PhpVersion::Php80,
db: Database::Postgres, db: Database::Postgres,
services: vec![Service::Ldap(Ldap), Service::LdapAdmin(LdapAdmin)], services: vec![Service::Ldap(Ldap), Service::LdapAdmin(LdapAdmin)],
..Default::default() ..Default::default()
} }
); );
let mut args = vec!["7", "pgsql", "ldap", "mypreset"] let mut args = vec!["8", "pgsql", "ldap", "mypreset"]
.into_iter() .into_iter()
.peekable(); .peekable();
@ -206,7 +206,7 @@ fn test_option_parse() {
assert_eq!( assert_eq!(
CloudOptions::parse(&config, &mut args).unwrap(), CloudOptions::parse(&config, &mut args).unwrap(),
CloudOptions { CloudOptions {
php: PhpVersion::Php74, php: PhpVersion::Php80,
db: Database::Postgres, db: Database::Postgres,
services: vec![ services: vec![
Service::Ldap(Ldap), Service::Ldap(Ldap),

2
src/php.rs
View file

@ -36,7 +36,7 @@ impl FromStr for PhpVersion {
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
match s { match s {
"8" => Ok(PhpVersion::Php81), "8" => Ok(PhpVersion::Php80),
"8.0" => Ok(PhpVersion::Php80), "8.0" => Ok(PhpVersion::Php80),
"8.1" => Ok(PhpVersion::Php81), "8.1" => Ok(PhpVersion::Php81),
"8.2" => Ok(PhpVersion::Php82), "8.2" => Ok(PhpVersion::Php82),