1
=== modified file 'tests/provider-AccountData/AccountData_test.cpp'
2
--- tests/provider-AccountData/AccountData_test.cpp	2016-12-20 02:31:23 +0000
3
+++ tests/provider-AccountData/AccountData_test.cpp	2017-01-12 06:03:31 +0000
4
@@ -175,5 +175,11 @@
5
175
{
175
{
6
176
    QCoreApplication app(argc, argv);
176
    QCoreApplication app(argc, argv);
7
177
    ::testing::InitGoogleTest(&argc, argv);
177
    ::testing::InitGoogleTest(&argc, argv);
9
178
    return RUN_ALL_TESTS();
178
    int rc = RUN_ALL_TESTS();
10
179
11
180
    // Process any pending events to avoid bogus leak reports from valgrind.
12
181
    QCoreApplication::sendPostedEvents();
13
182
    QCoreApplication::processEvents();
14
183
15
184
    return rc;
16
179
}
185
}
17
180
186
18
=== modified file 'tests/provider-ProviderInterface/ProviderInterface_test.cpp'
19
--- tests/provider-ProviderInterface/ProviderInterface_test.cpp	2016-11-03 02:43:43 +0000
20
+++ tests/provider-ProviderInterface/ProviderInterface_test.cpp	2017-01-12 06:03:31 +0000
21
@@ -788,5 +788,11 @@
22
788
    qDBusRegisterMetaType<unity::storage::internal::ItemMetadata>();
788
    qDBusRegisterMetaType<unity::storage::internal::ItemMetadata>();
23
789
    qDBusRegisterMetaType<QList<unity::storage::internal::ItemMetadata>>();
789
    qDBusRegisterMetaType<QList<unity::storage::internal::ItemMetadata>>();
24
790
    ::testing::InitGoogleTest(&argc, argv);
790
    ::testing::InitGoogleTest(&argc, argv);
26
791
    return RUN_ALL_TESTS();
791
    int rc = RUN_ALL_TESTS();
27
792
28
793
    // Process any pending events to avoid bogus leak reports from valgrind.
29
794
    QCoreApplication::sendPostedEvents();
30
795
    QCoreApplication::processEvents();
31
796
32
797
    return rc;
33
792
}
798
}
34
793
799
35
=== modified file 'tests/remote-client-v1/remote-client-v1_test.cpp'
36
--- tests/remote-client-v1/remote-client-v1_test.cpp	2016-11-15 05:48:12 +0000
37
+++ tests/remote-client-v1/remote-client-v1_test.cpp	2017-01-12 06:03:31 +0000
38
@@ -1142,5 +1142,11 @@
39
1142
    QCoreApplication app(argc, argv);
1142
    QCoreApplication app(argc, argv);
40
1143
1143
41
1144
    ::testing::InitGoogleTest(&argc, argv);
1144
    ::testing::InitGoogleTest(&argc, argv);
43
1145
    return RUN_ALL_TESTS();
1145
    int rc = RUN_ALL_TESTS();
44
1146
45
1147
    // Process any pending events to avoid bogus leak reports from valgrind.
46
1148
    QCoreApplication::sendPostedEvents();
47
1149
    QCoreApplication::processEvents();
48
1150
49
1151
    return rc;
50
1146
}
1152
}
51
1147
1153
52
=== modified file 'tests/remote-client/remote-client_test.cpp'
53
--- tests/remote-client/remote-client_test.cpp	2016-11-28 11:04:17 +0000
54
+++ tests/remote-client/remote-client_test.cpp	2017-01-12 06:03:31 +0000
55
@@ -376,7 +376,7 @@
56
376
376
57
377
    EXPECT_EQ(StorageError::Type::NoError, runtime_->shutdown().type());  // Destroy runtime.
377
    EXPECT_EQ(StorageError::Type::NoError, runtime_->shutdown().type());  // Destroy runtime.
58
378
378
60
379
    AccountsJob* j = runtime_->accounts();
379
    unique_ptr<AccountsJob> j(runtime_->accounts());
61
380
    EXPECT_FALSE(j->isValid());
380
    EXPECT_FALSE(j->isValid());
62
381
    EXPECT_EQ(AccountsJob::Status::Error, j->status());
381
    EXPECT_EQ(AccountsJob::Status::Error, j->status());
63
382
    EXPECT_EQ(StorageError::Type::RuntimeDestroyed, j->error().type());
382
    EXPECT_EQ(StorageError::Type::RuntimeDestroyed, j->error().type());
64
@@ -384,7 +384,7 @@
65
384
    EXPECT_EQ(QList<Account>(), j->accounts());
384
    EXPECT_EQ(QList<Account>(), j->accounts());
66
385
385
67
386
    // Signal must be received.
386
    // Signal must be received.
69
387
    QSignalSpy spy(j, &AccountsJob::statusChanged);
387
    QSignalSpy spy(j.get(), &AccountsJob::statusChanged);
70
388
    spy.wait(SIGNAL_WAIT_TIME);
388
    spy.wait(SIGNAL_WAIT_TIME);
71
389
    ASSERT_EQ(1, spy.count());
389
    ASSERT_EQ(1, spy.count());
72
390
    auto arg = spy.takeFirst();
390
    auto arg = spy.takeFirst();
73
@@ -3801,5 +3801,11 @@
74
3801
    QCoreApplication app(argc, argv);
3801
    QCoreApplication app(argc, argv);
75
3802
3802
76
3803
    ::testing::InitGoogleTest(&argc, argv);
3803
    ::testing::InitGoogleTest(&argc, argv);
78
3804
    return RUN_ALL_TESTS();
3804
    int rc = RUN_ALL_TESTS();
79
3805
80
3806
    // Process any pending events to avoid bogus leak reports from valgrind.
81
3807
    QCoreApplication::sendPostedEvents();
82
3808
    QCoreApplication::processEvents();
83
3809
84
3810
    return rc;
85
3805
}
3811
}
86
3806
3812
87
=== modified file 'tests/utils/ProviderFixture.cpp'
88
--- tests/utils/ProviderFixture.cpp	2016-09-26 02:37:03 +0000
89
+++ tests/utils/ProviderFixture.cpp	2017-01-12 06:03:31 +0000
90
@@ -46,6 +46,7 @@
91
46
void ProviderFixture::TearDown()
46
void ProviderFixture::TearDown()
92
47
{
47
{
93
48
    test_server_.reset();
48
    test_server_.reset();
94
49
    account_manager_.reset();
95
49
    service_connection_.reset();
50
    service_connection_.reset();
96
50
    QDBusConnection::disconnectFromBus(SERVICE_CONNECTION_NAME);
51
    QDBusConnection::disconnectFromBus(SERVICE_CONNECTION_NAME);
97
51
    dbus_.reset();
52
    dbus_.reset();
Status:	Merged
Approved by:	Michi Henning on 2017-01-13
Approved revision:	104
Merged at revision:	103
Proposed branch:	lp:~michihenning/storage-framework/valgrind-fixes
Merge into:	lp:storage-framework/devel
Diff against target:	97 lines (+31/-6) 5 files modified tests/provider-AccountData/AccountData_test.cpp (+7/-1) tests/provider-ProviderInterface/ProviderInterface_test.cpp (+7/-1) tests/remote-client-v1/remote-client-v1_test.cpp (+7/-1) tests/remote-client/remote-client_test.cpp (+9/-3) tests/utils/ProviderFixture.cpp (+1/-0)
To merge this branch:	bzr merge lp:~michihenning/storage-framework/valgrind-fixes
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2017-01-13
James Henstridge		2016-12-20	Approve on 2017-01-12
Review via email: mp+313587@code.launchpad.net