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

[Stephen M. Webb]

added autopkgtest (DEP-8) support and some tests

Added autopkgtest support. Added some tests.

[PS Jenkins bot (ps-jenkins)]

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)

[Chris Halse Rogers (raof)]

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

[PS Jenkins bot (ps-jenkins)]

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)

[Kevin DuBois (kdub)]

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

review: Approve

[Alan Griffiths (alan-griffiths)]

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

review: Needs Information

[Stephen M. Webb (bregma)]

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.

[Brandon Schaefer (brandontschaefer)]

Yay for tests

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[Mir CI Bot (mir-ci-bot)]

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)

[Alan Griffiths (alan-griffiths)]

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing

[lp:~bregma/unity-system-compositor/add-autopkgtest]

262. By Stephen M. Webb on 2016-03-01

synched with trunk

[Mir CI Bot (mir-ci-bot)]

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)

[Mir CI Bot (mir-ci-bot)]

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)

[Cemil Azizoglu (cemil-azizoglu)]

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]

263. By Stephen M. Webb on 2017-03-31

synched with trunk

Unmerged revisions

=== 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 @@
                libboost-system-dev,
                libdbus-1-dev,
                libgdk-pixbuf2.0-dev,
+               libgles2-mesa-dev,
                libglib2.0-dev,
-               libgles2-mesa-dev,
                libglm-dev,
                libmirclient-dev (>= 0.26.0),
                libmirserver-dev (>= 0.26.0),
                pkg-config,
                python3,
+               python3-pil:native,
                python3-setuptools,
-               python3-pil:native,
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Homepage: https://launchpad.net/unity-system-compositor
 # if you don't have have commit access to this branch but would like to upload
 # directly to Ubuntu, don't worry: your changes will be merged back into the
 # upstream branch
-Vcs-Bzr: lp:unity-system-compositor
+Vcs-Bzr: https://bazaar.launchpad.net/+branch/unity-system-compositor/
 
 Package: unity-system-compositor
 Architecture: any
-Depends: ${misc:Depends},
+Depends: ubuntu-wallpapers,
+         ${misc:Depends},
          ${shlibs:Depends},
-         ubuntu-wallpapers,
 Suggests: repowerd,
-Description: System compositor for Ubuntu
- System compositor used by the Mir display server in Ubuntu. If the Unity
+Description: Mir System Compositor
+ This is the system compositor using the Mir display server.  If the Unity
  System Compositor can't start, LightDM will fallback to plain Xorg display
  server.
 
@@ -46,5 +46,20 @@
          unity-system-compositor (>= ${source:Version}),
          ${misc:Depends},
          ${python3:Depends},
-Description: Test package for Unity System Compositor
- Autopilots tests for Unity System Compositor
+Description: Mir System Compositor autopilot integration tests
+ This is the system compositor using the Mir display server.
+ .
+ This package contains the Autopilots integration tests for the Unity System
+ Compositor.
+
+Package: unity-system-compositor-tests
+Architecture: any
+Depends: unity-system-compositor (>= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Mir System Compositor unit tests
+ This is the system compositor using the Mir display server.
+ .
+ General tests for Unity System Compositor targeted at autopkgtest runs when a
+ dependency has changed.
+

=== 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 @@
+Tests: mir
+Depends: unity-system-compositor-tests

=== 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 @@
+#!/bin/sh -e
+/usr/bin/usc_integration_tests
+exit 0

=== 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 @@
+usr/bin/usc_integration_tests
+usr/bin/usc_test_helper_wait_for_signal

=== 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 @@
 etc/dbus-1/system.d/com.canonical.Unity.conf
 usr/bin/unity-system-compositor-spinner
 usr/sbin/unity-system-compositor
-usr/share/dbus-1/interfaces/com.canonical.Unity.PowerButton.xml
 usr/share/dbus-1/interfaces/com.canonical.Unity.Display.xml
 usr/share/dbus-1/interfaces/com.canonical.Unity.Input.xml
+usr/share/dbus-1/interfaces/com.canonical.Unity.PowerButton.xml
 usr/share/dbus-1/interfaces/com.canonical.Unity.UserActivity.xml

=== 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 @@
+version=3
+https://launchpad.net/unity-system-compositor/+download .*/unity-system-compositor[-_]([0-9.]+)\.tar\.xz

=== 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 @@
 
 #include <mir/graphics/display.h>
 #include <mir/graphics/virtual_output.h>
+#include <mir/version.h>
 #include <gmock/gmock.h>
 
 namespace usc
@@ -53,11 +54,15 @@
 
     void resume() override {};
 
+#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 27, 0)
     std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor(
         std::shared_ptr<mir::graphics::CursorImage> const&) override
     {
         return {};
     };
+#else
+    std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor() override { return {}; }
+#endif
 
     std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int, int) override
     { return std::unique_ptr<mir::graphics::VirtualOutput>{}; }

=== 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 @@
 
 add_dependencies(usc_integration_tests GMock)
 add_dependencies(usc_integration_tests usc_test_helper_wait_for_signal)
+
+install(TARGETS usc_integration_tests usc_test_helper_wait_for_signal
+        RUNTIME DESTINATION bin)

=== 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 @@
 #include "mir/input/mir_keyboard_config.h"
 #include "mir/input/mir_pointer_config.h"
 #include "mir/input/mir_touchpad_config.h"
+#include <mir/version.h>
+
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+#include <mir/input/mir_touchscreen_config.h>
+#endif
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -54,6 +59,11 @@
         ON_CALL(*this, capabilities()).WillByDefault(Return(this->caps));
     }
 
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+    mir::optional_value<MirTouchscreenConfig> touchscreen_configuration() const { return {}; }
+    void apply_touchscreen_configuration(MirTouchscreenConfig const&) {}
+#endif
+
     mi::DeviceCapabilities caps;
 };
 

=== 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 @@
 #include "src/spinner.h"
 
 #include "mir/frontend/session.h"
+#include <mir/version.h>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -105,6 +106,7 @@
     {
         return {};
     }
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
     mir::graphics::BufferID create_buffer(mir::geometry::Size, MirPixelFormat) override
     {
         return {};
@@ -113,6 +115,7 @@
     {
         return {};
     }
+#endif
     void destroy_buffer(mir::graphics::BufferID) override
     {
     }