Unity 8

Merge lp:~lukas-kde/unity8/platform-mock into lp:unity8

  1. platform-mock
  2. Merge into trunk
Proposed by Lukáš Tinkl
Status: Merged
Approved by: Michał Sawicz
Approved revision: 2750
Merged at revision: 2764
Proposed branch: lp:~lukas-kde/unity8/platform-mock
Merge into: lp:unity8
Diff against target: 55 lines (+29/-0)
4 files modified
tests/mocks/Unity/CMakeLists.txt (+1/-0)
tests/mocks/Unity/Platform/CMakeLists.txt (+1/-0)
tests/mocks/Unity/Platform/MockPlatform.qml (+25/-0)
tests/mocks/Unity/Platform/qmldir (+2/-0)
To merge this branch: bzr merge lp:~lukas-kde/unity8/platform-mock
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+314423@code.launchpad.net

Commit message

Add Unity.Platform mock for our tests

Description of the change

Add Unity.Platform mock for our tests

* 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

* 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

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2750
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2869/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3747
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2161
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2161
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3775
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3619
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3619/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3619
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3619/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3619
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3619/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3619
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3619/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3619
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3619/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3619
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3619/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt 2016-05-04 18:09:25 +0000
+++ tests/mocks/Unity/CMakeLists.txt 2017-01-10 14:13:28 +0000
@@ -6,6 +6,7 @@
6add_subdirectory(Notifications)6add_subdirectory(Notifications)
7add_subdirectory(DashCommunicator)7add_subdirectory(DashCommunicator)
8add_subdirectory(Screens)8add_subdirectory(Screens)
9add_subdirectory(Platform)
910
10pkg_search_module(GOBJECT gobject-2.0 REQUIRED)11pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
11pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=12)12pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=12)
1213
=== added directory 'tests/mocks/Unity/Platform'
=== added file 'tests/mocks/Unity/Platform/CMakeLists.txt'
--- tests/mocks/Unity/Platform/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Platform/CMakeLists.txt 2017-01-10 14:13:28 +0000
@@ -0,0 +1,1 @@
1add_unity8_mock(Unity.Platform 1.0 Unity/Platform)
02
=== added file 'tests/mocks/Unity/Platform/MockPlatform.qml'
--- tests/mocks/Unity/Platform/MockPlatform.qml 1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Platform/MockPlatform.qml 2017-01-10 14:13:28 +0000
@@ -0,0 +1,25 @@
1/*
2 * Copyright (C) 2017 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17pragma Singleton
18
19import QtQuick 2.4
20
21QtObject {
22 property string chassis: "desktop"
23 property bool isPC: true
24 property bool isMultiSession: true
25}
026
=== added file 'tests/mocks/Unity/Platform/qmldir'
--- tests/mocks/Unity/Platform/qmldir 1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Platform/qmldir 2017-01-10 14:13:28 +0000
@@ -0,0 +1,2 @@
1module Unity.Platform
2singleton Platform 1.0 MockPlatform.qml

Subscribers

People subscribed via source and target branches