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

Improve autotest

parent 76a6e9c9
Pipeline #24393 passed with stage
in 25 minutes and 44 seconds
......@@ -107,7 +107,6 @@ void AbstractImportExportJob::backupUiRcFile(const QString &configFileName, cons
{
const QString configrcStr(configFileName);
const QString configrc = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/kxmlgui5/") + application + QLatin1Char('/') + configrcStr;
//qDebug() << "configrc " << configrc;
if (QFileInfo::exists(configrc)) {
backupFile(configrc, Utils::configsPath(), configrcStr);
}
......
[ArchiveMailCollection 4038]
archiveAge=3
archiveType=2
archiveUnit=0
enabled=true
maximumArchiveCount=0
saveCollectionId=4038
saveSubCollection=true
storePath=/home/laurent/a
[ArchiveMailDialog]
Size=500,300
[FolderSelectionDialog]
Size=500,300
......@@ -8,6 +8,7 @@ configs/kmail2rc
configs/templatesconfigurationrc
transports/mailtransports
configs/filters
configs/kontactui.rc
mails/akonadi_mbox_resource_1/agent_config_akonadi_mbox_resource_1
mails/akonadi_mbox_resource_1/akonadi_mbox_resource_1.mbox
mails/akonadi_mbox_resource_1/akonadi_mbox_resource_1rc
......
[ArchiveMailCollection foo/bla bla/bli4038]
archiveAge=3
archiveType=2
archiveUnit=0
enabled=true
maximumArchiveCount=0
saveCollectionId=foo/bla bla/bli4038
saveSubCollection=true
storePath=/home/laurent/a
[ArchiveMailDialog]
Size=500,300
[FolderSelectionDialog]
Size=500,300
<?xml version='1.0'?>
<!DOCTYPE gui SYSTEM 'kpartgui.dtd'>
<gui version="417" name="kontact">
<MenuBar>
<Menu noMerge="1" name="file">
<text>&amp;File</text>
<Merge/>
<Separator/>
<Action name="file_quit"/>
<Merge/>
</Menu>
<Merge/>
<Menu noMerge="1" name="view">
<text>&amp;View</text>
<Action name="hide_show_sidebar"/>
</Menu>
<Menu noMerge="1" name="settings">
<text>&amp;Settings</text>
<Merge name="StandardToolBarMenuHandler"/>
<Merge/>
<Action name="options_configure_keybinding"/>
<Action name="options_configure_toolbars"/>
<DefineGroup name="settings_configure"/>
<Action name="settings_configure_kontact"/>
</Menu>
<Menu name="help">
<text>&amp;Help</text>
<Action name="help_introduction" append="help_whats_this_merge"/>
</Menu>
</MenuBar>
<ToolBar noMerge="1" position="Top" name="navigatorToolBar" hidden="true">
<text>Navigator</text>
<ActionList name="navigator_actionlist"/>
</ToolBar>
<ToolBar noMerge="1" position="Top" name="mainToolBar">
<text>Main Toolbar</text>
<Action name="action_new"/>
<Action name="action_sync"/>
<Merge/>
</ToolBar>
<Merge/>
<ActionProperties/>
</gui>
<?xml version='1.0'?>
<!DOCTYPE gui SYSTEM 'kpartgui.dtd'>
<gui version="417" name="kontact">
<MenuBar>
<Menu noMerge="1" name="file">
<text>&amp;File</text>
<Merge/>
<Separator/>
<Action name="file_quit"/>
<Merge/>
</Menu>
<Merge/>
<Menu noMerge="1" name="view">
<text>&amp;View</text>
<Action name="hide_show_sidebar"/>
</Menu>
<Menu noMerge="1" name="settings">
<text>&amp;Settings</text>
<Merge name="StandardToolBarMenuHandler"/>
<Merge/>
<Action name="options_configure_keybinding"/>
<Action name="options_configure_toolbars"/>
<DefineGroup name="settings_configure"/>
<Action name="settings_configure_kontact"/>
</Menu>
<Menu name="help">
<text>&amp;Help</text>
<Action name="help_introduction" append="help_whats_this_merge"/>
</Menu>
</MenuBar>
<ToolBar noMerge="1" position="Top" name="navigatorToolBar" hidden="true">
<text>Navigator</text>
<ActionList name="navigator_actionlist"/>
</ToolBar>
<ToolBar noMerge="1" position="Top" name="mainToolBar">
<text>Main Toolbar</text>
<Action name="action_new"/>
<Action name="action_sync"/>
<Merge/>
</ToolBar>
<Merge/>
<ActionProperties/>
</gui>
......@@ -23,3 +23,4 @@ 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
configs/kontactui.rc
[ArchiveMailCollection 4048]
archiveAge=3
archiveType=2
archiveUnit=0
enabled=true
maximumArchiveCount=0
saveCollectionId=4048
saveSubCollection=true
storePath=/home/laurent/a
[ArchiveMailDialog]
Size=500,300
[FolderSelectionDialog]
Size=500,300
......@@ -260,7 +260,7 @@ void ExportMailJobInterface::backupConfig()
const QString collectionPath(archiveGroupPattern + realPath);
KConfigGroup newGroup(archiveConfig, collectionPath);
oldGroup.copyTo(&newGroup);
newGroup.writeEntry(QStringLiteral("saveCollectionId"), collectionPath);
newGroup.writeEntry(QStringLiteral("saveCollectionId"), realPath);
}
oldGroup.deleteGroup();
}
......
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