Skip to content

Commit 49c5aed

Browse files
committed
fix: fix test for test_file_backend_multi_routine
1 parent e32dd06 commit 49c5aed

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/cli/config.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
55
use std::{collections::HashMap, fmt, fs, path::Path};
66

7+
use better_default::Default;
78
use openssl::ssl::SslVersion;
89
use serde::{
910
de::{self, Visitor},
@@ -14,7 +15,7 @@ use serde_json::Value;
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
@@ -45,6 +45,7 @@ use ureq::AgentBuilder;
4545

4646
use crate::{
4747
api::{client::TLSConfigBuilder, Client},
48+
cli::config::Config,
4849
core::{Core, InitResult, SealConfig},
4950
errors::RvError,
5051
http,
@@ -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)