Commit fec6bb6a authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix autotest

parent 3a6cd7f7
Pipeline #23357 passed with stage
in 24 minutes and 27 seconds
......@@ -20,3 +20,6 @@ mails/akonadi_maildir_resource_1/akonadi_maildir_resource_1rc
resources/akonadi_pop3_resource_1rc
resources/akonadi_imap_resource_1rc
resources/akonadi_kolab_resource_1rc
resources/agent_config_akonadi_pop3_resource_1
resources/agent_config_akonadi_kolab_resource_1
resources/agent_config_akonadi_imap_resource_1
......@@ -7,3 +7,6 @@ configs/filters
resources/akonadi_pop3_resource_1rc
resources/akonadi_imap_resource_1rc
resources/akonadi_kolab_resource_1rc
resources/agent_config_akonadi_pop3_resource_1
resources/agent_config_akonadi_imap_resource_1
resources/agent_config_akonadi_kolab_resource_1
akonadi_pop3_resource
perso3
Host pop3.foo.org
IntervalCheckEnabled true
IntervalCheckInterval 24
LeaveOnServer true
LeaveOnServerDays 25
Login kde%foo.org
Pipelining true
SeenUidList 1589466101.18581.mail175.ha.foo.net,S=6906,1589466102.10772.mail114.ha.foo.net
TargetCollection 3788
UseTLS true
0
--------------------------
akonadi_imap_resource
akonadi_imap_resource_1rc
0
--------------------------
akonadi_kolab_resource
perso
ImapServer bli.bla.com
TrashCollection 245
UserName bla@bla.com
0
--------------------------
......@@ -623,7 +623,7 @@ void ExportMailJobInterface::backupResources()
setProgressDialogLabel(i18n("Backing up resources..."));
for (const Utils::AkonadiInstanceInfo &agent : qAsConst(mAkonadiInstanceInfo)) {
const QStringList capabilities(agent.capabilities);
const QStringList capabilities = agent.capabilities;
if (agent.mimeTypes.contains(KMime::Message::mimeType())) {
if (capabilities.contains(QLatin1String("Resource"))
&& !capabilities.contains(QLatin1String("Virtual"))
......
......@@ -213,8 +213,10 @@ QString ResourceConverterBase::storeResources(KZip *archive, const QString &iden
if (QFileInfo::exists(agentConfigFileNamePath)) {
fileAdded = archive->addLocalFile(agentConfigFileNamePath, path + agentConfigFileName);
if (!fileAdded) {
return i18n("Resource file \"%1\" cannot be added to backup file.", agentFileName);
return i18n("Resource file \"%1\" cannot be added to backup file.", agentConfigFileNamePath);
}
} else {
return i18n("Resource config file \"%1\" doesn't exist.", agentConfigFileNamePath);
}
return QString();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment