Unity 8

Merge lp:~nick-dedekind/unity8/UnityMenuModelStack-LeakFix into lp:unity8

Proposed by Nick Dedekind on 2015-10-08

Status:	Merged
Approved by:	Albert Astals Cid on 2015-10-09
Approved revision:	2001
Merged at revision:	2012
Proposed branch:	lp:~nick-dedekind/unity8/UnityMenuModelStack-LeakFix
Merge into:	lp:unity8
Diff against target:	32 lines (+2/-9) 1 file modified tests/plugins/Unity/Indicators/UnityMenuModelStackTest.cpp (+2/-9)
To merge this branch:	bzr merge lp:~nick-dedekind/unity8/UnityMenuModelStack-LeakFix
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2015-10-08	Approve on 2015-10-09
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-10-09
Review via email: mp+273858@code.launchpad.net

Fixed leak in UnityMenuModelStackTest

Fixed leak in UnityMenuModelStackTest

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

PS Jenkins bot (ps-jenkins) wrote on 2015-10-08:

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-10-09:

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) on 2015-10-09:

review: Approve

Albert Astals Cid (aacid) wrote on 2015-10-09:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass?
Yes for what it can

* Did you make sure that the branch does not contain spurious tags?
Yes

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'tests/plugins/Unity/Indicators/UnityMenuModelStackTest.cpp'
2	--- tests/plugins/Unity/Indicators/UnityMenuModelStackTest.cpp 2015-08-19 13:56:21 +0000
3	+++ tests/plugins/Unity/Indicators/UnityMenuModelStackTest.cpp 2015-10-08 15:26:25 +0000
4	@@ -43,6 +43,8 @@
5	{
6	delete m_model;
7	m_model = nullptr;
8	+ // send deleteLaters to avoid leaks.
9	+ QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
10	}
11
12	void testHeadOnSetHead()
13	@@ -146,19 +148,10 @@
14
15	m_model->removeRow(removeIndex);
16
17	- waitFor([&stack, resultCount]() { return stack.count() == resultCount; }, 1000);
18	QCOMPARE(stack.count(), resultCount);
19	}
20
21	private:
22	- bool waitFor(std::function<bool()> functor, int ms) {
23	-
24	- QElapsedTimer timer;
25	- timer.start();
26	- while(!functor() && timer.elapsed() < ms) { QTest::qWait(10); }
27	- return functor();
28	- }
29	-
30	QVariant recuseAddMenu(int subMenuCount, int depth_remaining)
31	{
32	QVariantList rows;