Unity System Compositor

Merge lp:~bregma/unity-system-compositor/add-autopkgtest into lp:unity-system-compositor

  1. add-autopkgtest
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Superseded
Proposed branch: lp:~bregma/unity-system-compositor/add-autopkgtest
Merge into: lp:unity-system-compositor
Diff against target: 203 lines (+56/-11)
10 files modified
debian/control (+25/-10)
debian/tests/control (+2/-0)
debian/tests/mir (+3/-0)
debian/unity-system-compositor-tests.install (+2/-0)
debian/unity-system-compositor.install (+1/-1)
debian/watch (+2/-0)
tests/include/usc/test/mock_display.h (+5/-0)
tests/integration-tests/CMakeLists.txt (+3/-0)
tests/unit-tests/test_mir_input_configuration.cpp (+10/-0)
tests/unit-tests/test_session_switcher.cpp (+3/-0)
To merge this branch: bzr merge lp:~bregma/unity-system-compositor/add-autopkgtest
Reviewer Review Type Date Requested Status
Cemil Azizoglu (community) Needs Fixing
Mir CI Bot continuous-integration Approve
Alan Griffiths Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Brandon Schaefer (community) Approve
Kevin DuBois (community) Approve
Chris Halse Rogers Needs Fixing
Review via email: mp+275249@code.launchpad.net

This proposal has been superseded by a proposal from 2017-03-31.

Commit message

added autopkgtest (DEP-8) support and some tests

Description of the change

Added autopkgtest support. Added some tests.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:260
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-i386-ci/83

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/295/rebuild

review: Approve (continuous-integration)
Revision history for this message
Chris Halse Rogers (raof) wrote :

Almost all of this diff is redundant? Could you please drop all the changes removing the trailing commas from the debian/control lists? Having the trailing commas makes diffs more readable, as all the changed lines are significant.

Other than that, LGTM.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:261
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/296/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-i386-ci/84

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/296/rebuild

review: Approve (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

looks okay to me, although not sure why some of the dependency orderings have changed in control.

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

There are unrelated changes in debian/control - are they there for a reason?

review: Needs Information
Revision history for this message
Stephen M. Webb (bregma) wrote :

The unrelated changes in debian/control are due to running wrap-and-sort on it like a good little Debian packager. It gets hard to remember which packages are good citizens and which are contemptuous of best practices, so I just always run it.

If it really causes a problem, I can revert that change.

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Yay for tests

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-autolanding/123/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-amd64-autolanding/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-armhf-autolanding/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-i386-autolanding/14/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:261
https://mir-jenkins.ubuntu.com/job/usc-ci/5/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/5/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-0-fetch/128/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/123/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/123/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/8/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/8/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/8/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/5/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing
lp:~bregma/unity-system-compositor/add-autopkgtest updated
262. By Stephen M. Webb

synched with trunk

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:262
https://mir-jenkins.ubuntu.com/job/usc-ci/13/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/15/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/312
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/304
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/304
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/19/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/19/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/19/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/13/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:262
https://mir-jenkins.ubuntu.com/job/usc-ci/17/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/20
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/371
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/363
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/363
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/24
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/24/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/24
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/24/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/24
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/24/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/17/rebuild

review: Approve (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

I'm assuming this is unintentional.
8 + libmirclient-dev (>= 0.13.0),
9 + libmirserver-dev (>= 0.13.0),
10 libglm-dev,
11 - libmirclient-dev (>= 0.19.0),
12 - libmirserver-dev (>= 0.19.0),

review: Needs Fixing
lp:~bregma/unity-system-compositor/add-autopkgtest updated
263. By Stephen M. Webb

synched with trunk

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2017-01-17 21:10:21 +0000
+++ debian/control 2017-03-31 02:23:59 +0000
@@ -13,30 +13,30 @@
13 libboost-system-dev,13 libboost-system-dev,
14 libdbus-1-dev,14 libdbus-1-dev,
15 libgdk-pixbuf2.0-dev,15 libgdk-pixbuf2.0-dev,
16 libgles2-mesa-dev,
16 libglib2.0-dev,17 libglib2.0-dev,
17 libgles2-mesa-dev,
18 libglm-dev,18 libglm-dev,
19 libmirclient-dev (>= 0.26.0),19 libmirclient-dev (>= 0.26.0),
20 libmirserver-dev (>= 0.26.0),20 libmirserver-dev (>= 0.26.0),
21 pkg-config,21 pkg-config,
22 python3,22 python3,
23 python3-pil:native,
23 python3-setuptools,24 python3-setuptools,
24 python3-pil:native,25Standards-Version: 3.9.8
25Standards-Version: 3.9.7
26Homepage: https://launchpad.net/unity-system-compositor26Homepage: https://launchpad.net/unity-system-compositor
27# if you don't have have commit access to this branch but would like to upload27# if you don't have have commit access to this branch but would like to upload
28# directly to Ubuntu, don't worry: your changes will be merged back into the28# directly to Ubuntu, don't worry: your changes will be merged back into the
29# upstream branch29# upstream branch
30Vcs-Bzr: lp:unity-system-compositor30Vcs-Bzr: https://bazaar.launchpad.net/+branch/unity-system-compositor/
3131
32Package: unity-system-compositor32Package: unity-system-compositor
33Architecture: any33Architecture: any
34Depends: ${misc:Depends},34Depends: ubuntu-wallpapers,
35 ${misc:Depends},
35 ${shlibs:Depends},36 ${shlibs:Depends},
36 ubuntu-wallpapers,
37Suggests: repowerd,37Suggests: repowerd,
38Description: System compositor for Ubuntu38Description: Mir System Compositor
39 System compositor used by the Mir display server in Ubuntu. If the Unity39 This is the system compositor using the Mir display server. If the Unity
40 System Compositor can't start, LightDM will fallback to plain Xorg display40 System Compositor can't start, LightDM will fallback to plain Xorg display
41 server.41 server.
4242
@@ -46,5 +46,20 @@
46 unity-system-compositor (>= ${source:Version}),46 unity-system-compositor (>= ${source:Version}),
47 ${misc:Depends},47 ${misc:Depends},
48 ${python3:Depends},48 ${python3:Depends},
49Description: Test package for Unity System Compositor49Description: Mir System Compositor autopilot integration tests
50 Autopilots tests for Unity System Compositor50 This is the system compositor using the Mir display server.
51 .
52 This package contains the Autopilots integration tests for the Unity System
53 Compositor.
54
55Package: unity-system-compositor-tests
56Architecture: any
57Depends: unity-system-compositor (>= ${source:Version}),
58 ${misc:Depends},
59 ${shlibs:Depends},
60Description: Mir System Compositor unit tests
61 This is the system compositor using the Mir display server.
62 .
63 General tests for Unity System Compositor targeted at autopkgtest runs when a
64 dependency has changed.
65
5166
=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control 1970-01-01 00:00:00 +0000
+++ debian/tests/control 2017-03-31 02:23:59 +0000
@@ -0,0 +1,2 @@
1Tests: mir
2Depends: unity-system-compositor-tests
03
=== added file 'debian/tests/mir'
--- debian/tests/mir 1970-01-01 00:00:00 +0000
+++ debian/tests/mir 2017-03-31 02:23:59 +0000
@@ -0,0 +1,3 @@
1#!/bin/sh -e
2/usr/bin/usc_integration_tests
3exit 0
04
=== added file 'debian/unity-system-compositor-tests.install'
--- debian/unity-system-compositor-tests.install 1970-01-01 00:00:00 +0000
+++ debian/unity-system-compositor-tests.install 2017-03-31 02:23:59 +0000
@@ -0,0 +1,2 @@
1usr/bin/usc_integration_tests
2usr/bin/usc_test_helper_wait_for_signal
03
=== modified file 'debian/unity-system-compositor.install'
--- debian/unity-system-compositor.install 2016-05-24 13:56:28 +0000
+++ debian/unity-system-compositor.install 2017-03-31 02:23:59 +0000
@@ -3,7 +3,7 @@
3etc/dbus-1/system.d/com.canonical.Unity.conf3etc/dbus-1/system.d/com.canonical.Unity.conf
4usr/bin/unity-system-compositor-spinner4usr/bin/unity-system-compositor-spinner
5usr/sbin/unity-system-compositor5usr/sbin/unity-system-compositor
6usr/share/dbus-1/interfaces/com.canonical.Unity.PowerButton.xml
7usr/share/dbus-1/interfaces/com.canonical.Unity.Display.xml6usr/share/dbus-1/interfaces/com.canonical.Unity.Display.xml
8usr/share/dbus-1/interfaces/com.canonical.Unity.Input.xml7usr/share/dbus-1/interfaces/com.canonical.Unity.Input.xml
8usr/share/dbus-1/interfaces/com.canonical.Unity.PowerButton.xml
9usr/share/dbus-1/interfaces/com.canonical.Unity.UserActivity.xml9usr/share/dbus-1/interfaces/com.canonical.Unity.UserActivity.xml
1010
=== added file 'debian/watch'
--- debian/watch 1970-01-01 00:00:00 +0000
+++ debian/watch 2017-03-31 02:23:59 +0000
@@ -0,0 +1,2 @@
1version=3
2https://launchpad.net/unity-system-compositor/+download .*/unity-system-compositor[-_]([0-9.]+)\.tar\.xz
03
=== modified file 'tests/include/usc/test/mock_display.h'
--- tests/include/usc/test/mock_display.h 2016-11-09 18:13:05 +0000
+++ tests/include/usc/test/mock_display.h 2017-03-31 02:23:59 +0000
@@ -21,6 +21,7 @@
2121
22#include <mir/graphics/display.h>22#include <mir/graphics/display.h>
23#include <mir/graphics/virtual_output.h>23#include <mir/graphics/virtual_output.h>
24#include <mir/version.h>
24#include <gmock/gmock.h>25#include <gmock/gmock.h>
2526
26namespace usc27namespace usc
@@ -53,11 +54,15 @@
5354
54 void resume() override {};55 void resume() override {};
5556
57#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 27, 0)
56 std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor(58 std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor(
57 std::shared_ptr<mir::graphics::CursorImage> const&) override59 std::shared_ptr<mir::graphics::CursorImage> const&) override
58 {60 {
59 return {};61 return {};
60 };62 };
63#else
64 std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor() override { return {}; }
65#endif
6166
62 std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int, int) override67 std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int, int) override
63 { return std::unique_ptr<mir::graphics::VirtualOutput>{}; }68 { return std::unique_ptr<mir::graphics::VirtualOutput>{}; }
6469
=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt 2016-04-18 14:58:36 +0000
+++ tests/integration-tests/CMakeLists.txt 2017-03-31 02:23:59 +0000
@@ -57,3 +57,6 @@
5757
58add_dependencies(usc_integration_tests GMock)58add_dependencies(usc_integration_tests GMock)
59add_dependencies(usc_integration_tests usc_test_helper_wait_for_signal)59add_dependencies(usc_integration_tests usc_test_helper_wait_for_signal)
60
61install(TARGETS usc_integration_tests usc_test_helper_wait_for_signal
62 RUNTIME DESTINATION bin)
6063
=== modified file 'tests/unit-tests/test_mir_input_configuration.cpp'
--- tests/unit-tests/test_mir_input_configuration.cpp 2017-01-19 19:49:44 +0000
+++ tests/unit-tests/test_mir_input_configuration.cpp 2017-03-31 02:23:59 +0000
@@ -25,6 +25,11 @@
25#include "mir/input/mir_keyboard_config.h"25#include "mir/input/mir_keyboard_config.h"
26#include "mir/input/mir_pointer_config.h"26#include "mir/input/mir_pointer_config.h"
27#include "mir/input/mir_touchpad_config.h"27#include "mir/input/mir_touchpad_config.h"
28#include <mir/version.h>
29
30#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
31#include <mir/input/mir_touchscreen_config.h>
32#endif
2833
29#include <gtest/gtest.h>34#include <gtest/gtest.h>
30#include <gmock/gmock.h>35#include <gmock/gmock.h>
@@ -54,6 +59,11 @@
54 ON_CALL(*this, capabilities()).WillByDefault(Return(this->caps));59 ON_CALL(*this, capabilities()).WillByDefault(Return(this->caps));
55 }60 }
5661
62#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
63 mir::optional_value<MirTouchscreenConfig> touchscreen_configuration() const { return {}; }
64 void apply_touchscreen_configuration(MirTouchscreenConfig const&) {}
65#endif
66
57 mi::DeviceCapabilities caps;67 mi::DeviceCapabilities caps;
58};68};
5969
6070
=== modified file 'tests/unit-tests/test_session_switcher.cpp'
--- tests/unit-tests/test_session_switcher.cpp 2017-02-06 12:48:40 +0000
+++ tests/unit-tests/test_session_switcher.cpp 2017-03-31 02:23:59 +0000
@@ -20,6 +20,7 @@
20#include "src/spinner.h"20#include "src/spinner.h"
2121
22#include "mir/frontend/session.h"22#include "mir/frontend/session.h"
23#include <mir/version.h>
2324
24#include <gtest/gtest.h>25#include <gtest/gtest.h>
25#include <gmock/gmock.h>26#include <gmock/gmock.h>
@@ -105,6 +106,7 @@
105 {106 {
106 return {};107 return {};
107 }108 }
109#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
108 mir::graphics::BufferID create_buffer(mir::geometry::Size, MirPixelFormat) override110 mir::graphics::BufferID create_buffer(mir::geometry::Size, MirPixelFormat) override
109 {111 {
110 return {};112 return {};
@@ -113,6 +115,7 @@
113 {115 {
114 return {};116 return {};
115 }117 }
118#endif
116 void destroy_buffer(mir::graphics::BufferID) override119 void destroy_buffer(mir::graphics::BufferID) override
117 {120 {
118 }121 }

Subscribers

People subscribed via source and target branches