stalwartlabs/mail-server
1
1
Fork 0
mirror of https://github.com/stalwartlabs/mail-server.git synced 2025-09-09 13:34:26 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve file macros after dropping root privileges (fixed tests)

Browse source
This commit is contained in:
mdecimus 2024-05-08 18:33:08 +02:00
parent 53e6c352d8
commit a1930fa0f4
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/src/imap/mod.rs
View file

@ -274,7 +274,7 @@ async fn init_imap_tests(store_id: &str, delete_if_exists: bool) -> IMAPTest {
.replace("{TMP}", &temp_dir.path.display().to_string()),
)
.unwrap();
config.resolve_macros().await;
config.resolve_all_macros().await;
// Parse servers
let mut servers = Servers::parse(&mut config);

2
tests/src/jmap/mod.rs
View file

@ -408,7 +408,7 @@ async fn init_jmap_tests(store_id: &str, delete_if_exists: bool) -> JMAPTest {
.replace("{TMP}", &temp_dir.path.display().to_string()),
)
.unwrap();
config.resolve_macros().await;
config.resolve_all_macros().await;
// Parse servers
let mut servers = Servers::parse(&mut config);

2
tests/src/jmap/push_subscription.rs
View file

@ -114,7 +114,7 @@ pub async fn test(params: &mut JMAPTest) {
// Start mock push server
let mut settings = Config::new(add_test_certs(SERVER)).unwrap();
settings.resolve_macros().await;
settings.resolve_all_macros().await;
let mock_core = Core::parse(&mut settings, Default::default(), Default::default())
.await
.into_shared();

2
tests/src/smtp/inbound/antispam.rs
View file

@ -200,7 +200,7 @@ async fn antispam() {
// Parse config
let mut config = Config::new(&config).unwrap();
config.resolve_macros().await;
config.resolve_all_macros().await;
let stores = Stores::parse_all(&mut config).await;
let core = Core::parse(&mut config, stores, Default::default()).await;
//config.assert_no_errors();

2
tests/src/smtp/inbound/scripts.rs
View file

@ -158,7 +158,7 @@ async fn sieve_scripts() {
),
)
.unwrap();
config.resolve_macros().await;
config.resolve_all_macros().await;
let stores = Stores::parse_all(&mut config).await;
let core = Core::parse(&mut config, stores, Default::default()).await;
let mut qr = inner.init_test_queue(&core);

2
tests/src/smtp/outbound/mod.rs
View file

@ -105,7 +105,7 @@ impl TestServer {
let temp_dir = TempDir::new(name, true);
let mut config =
Config::new(temp_dir.update_config(add_test_certs(CONFIG) + config.as_ref())).unwrap();
config.resolve_macros().await;
config.resolve_all_macros().await;
let stores = Stores::parse_all(&mut config).await;
let core = Core::parse(&mut config, stores, Default::default()).await;
let mut inner = Inner::default();