Skip to content

Commit 798697c

Browse files
committed
fix: fix test for test_file_backend_multi_routine
1 parent e32dd06 commit 798697c

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

src/cli/config.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ use serde::{
1010
Deserialize, Deserializer, Serialize, Serializer,
1111
};
1212
use serde_json::Value;
13+
use better_default::Default;
1314

1415
use crate::errors::RvError;
1516

1617
/// A struct that contains several configurable options of RustyVault server
17-
#[derive(Debug, Clone, Serialize, Deserialize)]
18+
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
1819
pub struct Config {
1920
#[serde(deserialize_with = "validate_listener")]
2021
pub listener: HashMap<String, Listener>,
@@ -41,12 +42,14 @@ pub struct Config {
4142
#[serde(default = "default_hmac_level")]
4243
pub mount_entry_hmac_level: MountEntryHMACLevel,
4344
#[serde(default = "default_mounts_monitor_interval")]
45+
#[default(5)]
4446
pub mounts_monitor_interval: u64,
4547
}
4648

47-
#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq)]
49+
#[derive(Debug, Copy, Clone, Default, Serialize, Deserialize, PartialEq)]
4850
#[serde(rename_all = "lowercase")]
4951
pub enum MountEntryHMACLevel {
52+
#[default]
5053
None,
5154
Compat,
5255
High,

src/test_utils.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ use tokio::sync::oneshot;
4444
use ureq::AgentBuilder;
4545

4646
use crate::{
47+
cli::config::Config,
4748
api::{client::TLSConfigBuilder, Client},
4849
core::{Core, InitResult, SealConfig},
4950
errors::RvError,
@@ -201,9 +202,10 @@ impl TestHttpServer {
201202
}
202203

203204
pub fn new_with_backend(backend: Arc<dyn Backend>, tls_enable: bool) -> Self {
205+
let config = Config::default();
204206
let barrier = Arc::new(Barrier::new(2));
205207
let (stop_tx, stop_rx) = oneshot::channel();
206-
let rvault = RustyVault::new(backend, None).unwrap();
208+
let rvault = RustyVault::new(backend, Some(&config)).unwrap();
207209
let core = rvault.core.load().clone();
208210

209211
let mut scheme = "http";

0 commit comments

Comments
 (0)