From a1930fa0f41f5106a53065596576d5570f2225b6 Mon Sep 17 00:00:00 2001
From: mdecimus <mauro@stalw.art>
Date: Wed, 8 May 2024 18:33:08 +0200
Subject: [PATCH] Resolve file macros after dropping root privileges (fixed
 tests)

---
 tests/src/imap/mod.rs               | 2 +-
 tests/src/jmap/mod.rs               | 2 +-
 tests/src/jmap/push_subscription.rs | 2 +-
 tests/src/smtp/inbound/antispam.rs  | 2 +-
 tests/src/smtp/inbound/scripts.rs   | 2 +-
 tests/src/smtp/outbound/mod.rs      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/src/imap/mod.rs b/tests/src/imap/mod.rs
index 799a0e43..6e00673e 100644
--- a/tests/src/imap/mod.rs
+++ b/tests/src/imap/mod.rs
@@ -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);
diff --git a/tests/src/jmap/mod.rs b/tests/src/jmap/mod.rs
index a5f8e9b7..4e1b5ff3 100644
--- a/tests/src/jmap/mod.rs
+++ b/tests/src/jmap/mod.rs
@@ -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);
diff --git a/tests/src/jmap/push_subscription.rs b/tests/src/jmap/push_subscription.rs
index e8674666..1d41f176 100644
--- a/tests/src/jmap/push_subscription.rs
+++ b/tests/src/jmap/push_subscription.rs
@@ -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();
diff --git a/tests/src/smtp/inbound/antispam.rs b/tests/src/smtp/inbound/antispam.rs
index 2490beaf..aba8c494 100644
--- a/tests/src/smtp/inbound/antispam.rs
+++ b/tests/src/smtp/inbound/antispam.rs
@@ -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();
diff --git a/tests/src/smtp/inbound/scripts.rs b/tests/src/smtp/inbound/scripts.rs
index aa801582..4046642b 100644
--- a/tests/src/smtp/inbound/scripts.rs
+++ b/tests/src/smtp/inbound/scripts.rs
@@ -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);
diff --git a/tests/src/smtp/outbound/mod.rs b/tests/src/smtp/outbound/mod.rs
index c4a66a06..17d7c70b 100644
--- a/tests/src/smtp/outbound/mod.rs
+++ b/tests/src/smtp/outbound/mod.rs
@@ -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();