Merge upstream v0.16.25 #155

Merged
jcoffey-dev merged 3 commits from merge/upstream-v0.16.25 into main 2026-10-06 07:30:13 +00:00
Showing only changes of commit b25258330c - Show all commits
+19 -2
View File
@@ -2,6 +2,8 @@
* SPDX-FileCopyrightText: 2020 Stalwart Labs LLC <[email protected]> * SPDX-FileCopyrightText: 2020 Stalwart Labs LLC <[email protected]>
* *
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
*
* Modified by Coffey Labs in 2026 for INBUXA.
*/ */
use crate::utils::{jmap::JmapUtils, server::TestServer}; use crate::utils::{jmap::JmapUtils, server::TestServer};
@@ -11,8 +13,8 @@ use registry::{
enums::{Permission, TaskSpamFilterMaintenanceType, TaskStoreMaintenanceType}, enums::{Permission, TaskSpamFilterMaintenanceType, TaskStoreMaintenanceType},
prelude::{ObjectType, Property}, prelude::{ObjectType, Property},
structs::{ structs::{
Permissions, PermissionsList, SpamTrainingSample, Task, TaskSpamFilterMaintenance, Jmap, Permissions, PermissionsList, SpamTrainingSample, Task,
TaskStatus, TaskStoreMaintenance, TaskSpamFilterMaintenance, TaskStatus, TaskStoreMaintenance,
}, },
}, },
types::map::Map, types::map::Map,
@@ -26,6 +28,21 @@ pub async fn test(test: &mut TestServer) {
// Create test accounts // Create test accounts
let admin = test.account("[email protected]"); let admin = test.account("[email protected]");
// inbuxa: the quota test leaves uploads expiring after one second, at
// most three at a time. This test imports twenty samples, and a debug
// build can take longer than that between upload and import.
admin
.registry_update_setting(
Jmap::default(),
&[
Property::UploadQuota,
Property::MaxUploadCount,
Property::UploadTtl,
],
)
.await;
admin.reload_settings().await;
let account = test let account = test
.create_user_account( .create_user_account(
"[email protected]", "[email protected]",