Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-05-06 08:35:37 -04:00
Code Issues Projects Releases Packages Wiki Activity

Properly block modified signal during Database destruction (#6438)

Browse source 
fixes #6393
This commit is contained in:
Aetf 2021-05-27 21:50:15 -04:00 • committed by GitHub
parent 66c3026cf5
commit 81a66c439c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 370 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/TestMerge.cpp
View file

@ -1479,7 +1479,7 @@ void TestMerge::testMergeNotModified()
QScopedPointer<Database> dbSource(
createTestDatabaseStructureClone(dbDestination.data(), Entry::CloneNoFlags, Group::CloneIncludeEntries));
QSignalSpy modifiedSignalSpy(dbDestination.data(), SIGNAL(databaseModified()));
QSignalSpy modifiedSignalSpy(dbDestination.data(), SIGNAL(modified()));
Merger merger(dbSource.data(), dbDestination.data());
merger.merge();
QTRY_VERIFY(modifiedSignalSpy.empty());
@ -1491,7 +1491,7 @@ void TestMerge::testMergeModified()
QScopedPointer<Database> dbSource(
createTestDatabaseStructureClone(dbDestination.data(), Entry::CloneNoFlags, Group::CloneIncludeEntries));
QSignalSpy modifiedSignalSpy(dbDestination.data(), SIGNAL(databaseModified()));
QSignalSpy modifiedSignalSpy(dbDestination.data(), SIGNAL(modified()));
// Make sure the two changes have a different timestamp.
QTest::qSleep(1);
Entry* entry = dbSource->rootGroup()->findEntryByPath("entry1");