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

Fix delete temporary repo

parent d13bcc81
Pipeline #21391 passed with stage
in 12 minutes and 8 seconds
...@@ -52,6 +52,7 @@ void ImportAlarmJobInterfaceTest::importAlarmConfig() ...@@ -52,6 +52,7 @@ void ImportAlarmJobInterfaceTest::importAlarmConfig()
file->setExcludePath(Utils::alarmPath()); file->setExcludePath(Utils::alarmPath());
ImportAlarmJobInterfaceTestImpl *impl = new ImportAlarmJobInterfaceTestImpl(this, options, file->archiveStorage(), 1); ImportAlarmJobInterfaceTestImpl *impl = new ImportAlarmJobInterfaceTestImpl(this, options, file->archiveStorage(), 1);
impl->setPathConfig(file->pathConfig()); impl->setPathConfig(file->pathConfig());
impl->setExtractPath(file->extractPath());
file->setAbstractImportExportJob(impl); file->setAbstractImportExportJob(impl);
file->setLoggingFilePath(impl->loggingFilePath()); file->setLoggingFilePath(impl->loggingFilePath());
file->start(); file->start();
......
...@@ -32,7 +32,7 @@ ImportAlarmJobInterfaceTestImpl::ImportAlarmJobInterfaceTestImpl(QObject *parent ...@@ -32,7 +32,7 @@ ImportAlarmJobInterfaceTestImpl::ImportAlarmJobInterfaceTestImpl(QObject *parent
ImportAlarmJobInterfaceTestImpl::~ImportAlarmJobInterfaceTestImpl() ImportAlarmJobInterfaceTestImpl::~ImportAlarmJobInterfaceTestImpl()
{ {
//Clean up temp repo //Clean up temp repo
QVERIFY(QDir(QDir::tempPath() + QLatin1Char('/') + Utils::storeAlarm()).removeRecursively()); QVERIFY(QDir(extractPath()).removeRecursively());
} }
Akonadi::Collection::Id ImportAlarmJobInterfaceTestImpl::convertFolderPathToCollectionId(const QString &path) Akonadi::Collection::Id ImportAlarmJobInterfaceTestImpl::convertFolderPathToCollectionId(const QString &path)
......
...@@ -53,6 +53,7 @@ void ImportCalendarJobInterfaceTest::importCalendar() ...@@ -53,6 +53,7 @@ void ImportCalendarJobInterfaceTest::importCalendar()
file->setExcludePath(Utils::calendarPath()); file->setExcludePath(Utils::calendarPath());
ImportCalendarJobInterfaceTestImpl *impl = new ImportCalendarJobInterfaceTestImpl(this, options, file->archiveStorage(), 1); ImportCalendarJobInterfaceTestImpl *impl = new ImportCalendarJobInterfaceTestImpl(this, options, file->archiveStorage(), 1);
impl->setPathConfig(file->pathConfig()); impl->setPathConfig(file->pathConfig());
impl->setExtractPath(file->extractPath());
file->setAbstractImportExportJob(impl); file->setAbstractImportExportJob(impl);
file->setLoggingFilePath(impl->loggingFilePath()); file->setLoggingFilePath(impl->loggingFilePath());
file->start(); file->start();
......
...@@ -30,7 +30,7 @@ ImportCalendarJobInterfaceTestImpl::ImportCalendarJobInterfaceTestImpl(QObject * ...@@ -30,7 +30,7 @@ ImportCalendarJobInterfaceTestImpl::ImportCalendarJobInterfaceTestImpl(QObject *
ImportCalendarJobInterfaceTestImpl::~ImportCalendarJobInterfaceTestImpl() ImportCalendarJobInterfaceTestImpl::~ImportCalendarJobInterfaceTestImpl()
{ {
//Clean up temp repo //Clean up temp repo
QVERIFY(QDir(QDir::tempPath() + QLatin1Char('/') + Utils::storeCalendar()).removeRecursively()); QVERIFY(QDir(extractPath()).removeRecursively());
} }
Akonadi::Collection::Id ImportCalendarJobInterfaceTestImpl::convertFolderPathToCollectionId(const QString &path) Akonadi::Collection::Id ImportCalendarJobInterfaceTestImpl::convertFolderPathToCollectionId(const QString &path)
......
...@@ -34,7 +34,6 @@ ImportMailJobInterfaceTestImpl::ImportMailJobInterfaceTestImpl(QObject *parent, ...@@ -34,7 +34,6 @@ ImportMailJobInterfaceTestImpl::ImportMailJobInterfaceTestImpl(QObject *parent,
ImportMailJobInterfaceTestImpl::~ImportMailJobInterfaceTestImpl() ImportMailJobInterfaceTestImpl::~ImportMailJobInterfaceTestImpl()
{ {
//Clean up temp repo. FIXME !
QVERIFY(QDir(extractPath()).removeRecursively()); QVERIFY(QDir(extractPath()).removeRecursively());
} }
......
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