Merge lp:~mardy/online-accounts-api/test-leaks-1617180 into lp:online-accounts-api

[Alberto Mardegan]

Tests: run main loop to avoid memory leaks

Tests: run main loop to avoid memory leaks

[lp:~mardy/online-accounts-api/test-leaks-1617180]

44. By Alberto Mardegan on 2016-12-21

same for QML tests

[Michi Henning (michihenning)]

That's a significant improvement, thank you! Together with the leak fix, that gets rid of the PendingCall related errors.

I'm still seeing other errors with valgrind in the tests. It would be good to chase these down as well.

review: Approve

=== modified file 'tests/lib/OnlineAccounts/functional_tests/functional_tests.cpp'
--- tests/lib/OnlineAccounts/functional_tests/functional_tests.cpp	2016-11-07 12:47:57 +0000
+++ tests/lib/OnlineAccounts/functional_tests/functional_tests.cpp	2016-12-21 07:50:21 +0000
@@ -81,6 +81,7 @@
     }
 
 private Q_SLOTS:
+    void cleanup();
     void testConstructor();
     void testManagerReady_data();
     void testManagerReady();
@@ -116,6 +117,14 @@
     m_dbus.startServices();
 }
 
+void FunctionalTests::cleanup()
+{
+    /* Iterate the main loop in order to execute the delayed cleanup methods
+     * and avoid memory leaks.
+     */
+    QTest::qWait(10);
+}
+
 void FunctionalTests::testConstructor()
 {
     // Standard constructor

=== modified file 'tests/lib/qml_module/tst_qml_module.cpp'
--- tests/lib/qml_module/tst_qml_module.cpp	2016-11-09 07:01:31 +0000
+++ tests/lib/qml_module/tst_qml_module.cpp	2016-12-21 07:50:21 +0000
@@ -92,6 +92,7 @@
 
 private Q_SLOTS:
     void initTestCase();
+    void cleanup();
     void testModuleImport();
     void testModelProperties();
     void testServices_data();
@@ -129,6 +130,14 @@
     qputenv("QML2_IMPORT_PATH", TEST_QML_IMPORT_PATH);
 }
 
+void ModuleTest::cleanup()
+{
+    /* Iterate the main loop in order to execute the delayed cleanup methods
+     * and avoid memory leaks.
+     */
+    QTest::qWait(10);
+}
+
 void ModuleTest::testModuleImport()
 {
     QQmlEngine engine;