Unity 8

Merge lp:~dandrader/unity8/ownMockMirSurface into lp:unity8

ownMockMirSurface
Merge into trunk

Proposed by Daniel d'Andrada on 2016-02-17

Status:	Merged
Approved by:	Michael Zanetti on 2016-02-17
Approved revision:	2202
Merged at revision:	2244
Proposed branch:	lp:~dandrader/unity8/ownMockMirSurface
Merge into:	lp:unity8
Diff against target:	20 lines (+3/-0) 1 file modified tests/mocks/Unity/Application/MirSurface.cpp (+3/-0)
To merge this branch:	bzr merge lp:~dandrader/unity8/ownMockMirSurface
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-17
Michael Zanetti (community)		2016-02-17	Approve on 2016-02-17
Unity8 CI Bot	continuous-integration		Approve on 2016-02-17
Review via email: mp+286298@code.launchpad.net

Commit Message

Ensure the QML engine doesn't delete our mock MirSurfaces on its own.

That would cause some hard-to-track failures in QML test runs.

Description of the Change

* 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?
Not applicable

* 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?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

Michael Zanetti (mzanetti) wrote on 2016-02-17:

fails to build here. probably forgot some include

/home/micha/Develop/reviews/ownMockMirSurface/tests/mocks/Unity/Application/MirSurface.cpp: In constructor ‘MirSurface::MirSurface(const QString&, Mir::Type, Mir::State, const QUrl&, const QUrl&)’:
/home/micha/Develop/reviews/ownMockMirSurface/tests/mocks/Unity/Application/MirSurface.cpp:41:5: error: ‘QQmlEngine’ has not been declared
     QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
     ^
/home/micha/Develop/reviews/ownMockMirSurface/tests/mocks/Unity/Application/MirSurface.cpp:41:42: error: ‘QQmlEngine’ has not been declared
     QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-17:

FAILED: Continuous integration, rev:2201
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/397/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/535/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/558
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/576
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/576
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/572/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/572/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/572/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/572/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/572/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/572/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/397/rebuild

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/ownMockMirSurface updated on 2016-02-17

2202. By Daniel d'Andrada on 2016-02-17: Add missing #include

Daniel d'Andrada (dandrader) wrote on 2016-02-17:

On 17/02/2016 10:37, Michael Zanetti wrote:
> Review: Needs Fixing
>
> fails to build here. probably forgot some include
>
> /home/micha/Develop/reviews/ownMockMirSurface/tests/mocks/Unity/Application/MirSurface.cpp: In constructor ‘MirSurface::MirSurface(const QString&, Mir::Type, Mir::State, const QUrl&, const QUrl&)’:
> /home/micha/Develop/reviews/ownMockMirSurface/tests/mocks/Unity/Application/MirSurface.cpp:41:5: error: ‘QQmlEngine’ has not been declared
> QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
> ^
> /home/micha/Develop/reviews/ownMockMirSurface/tests/mocks/Unity/Application/MirSurface.cpp:41:42: error: ‘QQmlEngine’ has not been declared
> QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
>

Fixed. Was copy-pasting this from my other branch (surface-based WM)...

PS Jenkins bot (ps-jenkins) wrote on 2016-02-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7335/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-17:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/398/rebuild

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-02-17:

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

compiled it, but relied on CI to actually run all the tests.

* Did CI run pass? If not, please explain why.

yip yip

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

yes

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2016-02-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7337/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
2	--- tests/mocks/Unity/Application/MirSurface.cpp 2015-11-30 18:25:47 +0000
3	+++ tests/mocks/Unity/Application/MirSurface.cpp 2016-02-17 12:51:06 +0000
4	@@ -17,6 +17,7 @@
5	#include "MirSurface.h"
6
7	#include <QDebug>
8	+#include <QQmlEngine>
9
10	MirSurface::MirSurface(const QString& name,
11	Mir::Type type,
12	@@ -38,6 +39,8 @@
13	, m_slowToResize(false)
14	{
15	// qDebug() << "MirSurface::MirSurface() " << name;
16	+ QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
17	+
18	m_delayedResizeTimer.setInterval(600);
19	m_delayedResizeTimer.setSingleShot(true);
20	connect(&m_delayedResizeTimer, &QTimer::timeout, this, &MirSurface::applyDelayedResize);