[Pkg-gnupg-commit] [gpgme] 213/412: Qt: Fix memleaks in tests

Daniel Kahn Gillmor dkg at fifthhorseman.net
Thu Sep 22 21:26:49 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit bfa8ac7e02c16790ee5bd3b42c26699f4821d72e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Jul 11 16:47:30 2016 +0200

    Qt: Fix memleaks in tests
    
    * lang/qt/tests/t-keylist.cpp(cleanupTestCase): Ensure that
    posted events are handled for autodeletion.
    (testSingleKeylistSync): delete job.
    * lang/qt/tests/t-ownertrust.cpp(cleanupTestCase): Ditto
    * lang/qt/tests/t-ownertrust.cpp(testChangeOwnerTrust): Delete
    keylistjobs.
    * lang/qt/tests/t-keylocate.cpp(cleanupTestCase): Ditto
---
 lang/qt/tests/t-keylist.cpp    | 6 ++++++
 lang/qt/tests/t-keylocate.cpp  | 5 +++++
 lang/qt/tests/t-ownertrust.cpp | 9 +++++++++
 3 files changed, 20 insertions(+)

diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp
index 38d315f..adc997a 100644
--- a/lang/qt/tests/t-keylist.cpp
+++ b/lang/qt/tests/t-keylist.cpp
@@ -55,6 +55,7 @@ private Q_SLOTS:
         std::vector<GpgME::Key> keys;
         GpgME::KeyListResult result = job->exec(QStringList() << QStringLiteral("alfa at example.net"),
                                                 false, keys);
+        delete job;
         Q_ASSERT (!result.error());
         Q_ASSERT (keys.size() == 1);
         const QString kId = QLatin1String(keys.front().keyID());
@@ -104,6 +105,11 @@ private Q_SLOTS:
         const QString gpgHome = qgetenv("GNUPGHOME");
         QVERIFY2(!gpgHome.isEmpty(), "GNUPGHOME environment variable is not set.");
     }
+
+    void cleanupTestCase()
+    {
+        QCoreApplication::sendPostedEvents();
+    }
 };
 
 QTEST_MAIN(KeyListTest)
diff --git a/lang/qt/tests/t-keylocate.cpp b/lang/qt/tests/t-keylocate.cpp
index 682f722..43aaf1c 100644
--- a/lang/qt/tests/t-keylocate.cpp
+++ b/lang/qt/tests/t-keylocate.cpp
@@ -120,6 +120,11 @@ private Q_SLOTS:
         const QString gpgHome = qgetenv("GNUPGHOME");
         QVERIFY2(!gpgHome.isEmpty(), "GNUPGHOME environment variable is not set.");
     }
+
+    void cleanupTestCase()
+    {
+        QCoreApplication::sendPostedEvents();
+    }
 private:
     QString mTestpattern;
 };
diff --git a/lang/qt/tests/t-ownertrust.cpp b/lang/qt/tests/t-ownertrust.cpp
index 9a0c1cd..8784a79 100644
--- a/lang/qt/tests/t-ownertrust.cpp
+++ b/lang/qt/tests/t-ownertrust.cpp
@@ -55,6 +55,7 @@ private Q_SLOTS:
         std::vector<GpgME::Key> keys;
         GpgME::KeyListResult result = job->exec(QStringList() << QStringLiteral("alfa at example.net"),
                                                 false, keys);
+        delete job;
         Q_ASSERT (!result.error());
         Q_ASSERT (keys.size() == 1);
         Key key = keys.front();
@@ -76,6 +77,7 @@ private Q_SLOTS:
         job = openpgp()->keyListJob(false, true, true);
         result = job->exec(QStringList() << QStringLiteral("alfa at example.net"),
                            false, keys);
+        delete job;
         key = keys.front();
         Q_ASSERT (key.ownerTrust() == Key::Ultimate);
 
@@ -91,6 +93,8 @@ private Q_SLOTS:
         job = openpgp()->keyListJob(false, true, true);
         result = job->exec(QStringList() << QStringLiteral("alfa at example.net"),
                            false, keys);
+        delete job;
+
         key = keys.front();
         Q_ASSERT (key.ownerTrust() == Key::Unknown);
     }
@@ -100,6 +104,11 @@ private Q_SLOTS:
         const QString gpgHome = qgetenv("GNUPGHOME");
         QVERIFY2(!gpgHome.isEmpty(), "GNUPGHOME environment variable is not set.");
     }
+
+    void cleanupTestCase()
+    {
+        QCoreApplication::sendPostedEvents();
+    }
 };
 
 QTEST_MAIN(ChangeOwnerTrustTest)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git



More information about the Pkg-gnupg-commit mailing list