TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add program argument for functional testing; simplify execute argument

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-08-26 21:29:00 +00:00
parent ffc41cb01f
commit fcb9d04d9e
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/config/mod.rs
View file

@ -1,5 +1,5 @@
use std::{ use std::{
collections::BTreeMap, collections::{BTreeMap, BTreeSet},
fmt, fmt,
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr}, net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
path::PathBuf, path::PathBuf,
@ -361,6 +361,9 @@ pub struct Config {
#[serde(default)] #[serde(default)]
pub tokio_console: bool, pub tokio_console: bool,
#[serde(default)]
pub test: BTreeSet<String>,
#[serde(flatten)] #[serde(flatten)]
#[allow(clippy::zero_sized_map_values)] // this is a catchall, the map shouldn't be zero at runtime #[allow(clippy::zero_sized_map_values)] // this is a catchall, the map shouldn't be zero at runtime
catchall: BTreeMap<String, IgnoredAny>, catchall: BTreeMap<String, IgnoredAny>,

11
src/main/clap.rs
View file

@ -28,6 +28,10 @@ pub(crate) struct Args {
/// Execute console command automatically after startup. /// Execute console command automatically after startup.
#[arg(long)] #[arg(long)]
pub(crate) execute: Vec<String>, pub(crate) execute: Vec<String>,
/// Set functional testing modes if available. Ex '--test=smoke'
#[arg(long, hide(true))]
pub(crate) test: Vec<String>,
} }
/// Parse commandline arguments into structured data /// Parse commandline arguments into structured data
@ -44,9 +48,10 @@ pub(crate) fn update(mut config: Figment, args: &Args) -> Result<Figment> {
} }
// Execute commands after any commands listed in configuration file // Execute commands after any commands listed in configuration file
for command in &args.execute { config = config.adjoin(("admin_execute", &args.execute));
config = config.adjoin(("admin_execute", [command]));
} // Update config with names of any functional-tests
config = config.adjoin(("test", &args.test));
// All other individual overrides can go last in case we have options which // All other individual overrides can go last in case we have options which
// set multiple conf items at once and the user still needs granular overrides. // set multiple conf items at once and the user still needs granular overrides.