Unity 8

Merge lp:~saviq/unity8/fix-greeter-tests into lp:unity8

  1. fix-greeter-tests
  2. Merge into trunk
Proposed by Michał Sawicz on 2015-09-21
Status: Merged
Approved by: Michael Zanetti on 2015-09-21
Approved revision: 1972
Merged at revision: 1973
Proposed branch: lp:~saviq/unity8/fix-greeter-tests
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/fixTestDashFallback
Diff against target: 60 lines (+5/-5)
5 files modified
plugins/IntegratedLightDM/liblightdm/CMakeLists.txt (+1/-1)
tests/CMakeLists.txt (+1/-1)
tests/autopilot/unity8/fixture_setup.py (+1/-1)
tests/autopilot/unity8/shell/tests/__init__.py (+1/-1)
tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~saviq/unity8/fix-greeter-tests
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-09-21
Albert Astals Cid (community) 2015-09-21 Approve on 2015-09-21
Review via email: mp+271774@code.launchpad.net

Commit Message

Fix integrated LightDM path

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
Prereq
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * 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.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1970
http://jenkins.qa.ubuntu.com/job/unity8-ci/6322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4276
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/691
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1034
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/929
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/930
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/562
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3483
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4273
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4273/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23513
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/407
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/691
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/691/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23514

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

review: Needs Fixing (continuous-integration)
Albert Astals Cid (aacid) wrote :

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

 * Did CI run pass?
Yes (wily autopilot is weird)

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

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1972
http://jenkins.qa.ubuntu.com/job/unity8-ci/6327/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4285
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/357
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/935
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/566
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/567
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3491
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4282
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23527
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/696
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/696/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23529

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/IntegratedLightDM/liblightdm/CMakeLists.txt'
2--- plugins/IntegratedLightDM/liblightdm/CMakeLists.txt 2015-01-20 11:50:19 +0000
3+++ plugins/IntegratedLightDM/liblightdm/CMakeLists.txt 2015-09-21 12:50:28 +0000
4@@ -33,5 +33,5 @@
5 OUTPUT_NAME lightdm-qt5-2)
6
7 install(TARGETS MockLightDM-demo-shared
8- DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/demo
9+ DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/demo
10 )
11
12=== modified file 'tests/CMakeLists.txt'
13--- tests/CMakeLists.txt 2015-08-06 22:45:56 +0000
14+++ tests/CMakeLists.txt 2015-09-21 12:50:28 +0000
15@@ -41,7 +41,7 @@
16 if(U8TEST_LIGHTDM)
17 list(APPEND ld_paths
18 ${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
19- ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
20+ ${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
21 )
22 endif()
23
24
25=== modified file 'tests/autopilot/unity8/fixture_setup.py'
26--- tests/autopilot/unity8/fixture_setup.py 2015-06-24 11:14:11 +0000
27+++ tests/autopilot/unity8/fixture_setup.py 2015-09-21 12:50:28 +0000
28@@ -74,7 +74,7 @@
29 def _get_lightdm_mock_path(self):
30 lib_path = get_mocks_library_path()
31 lightdm_mock_path = os.path.abspath(
32- os.path.join(lib_path, "LightDM", "liblightdm")
33+ os.path.join(lib_path, "IntegratedLightDM", "liblightdm")
34 )
35
36 if not os.path.exists(lightdm_mock_path):
37
38=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
39--- tests/autopilot/unity8/shell/tests/__init__.py 2015-06-22 15:47:34 +0000
40+++ tests/autopilot/unity8/shell/tests/__init__.py 2015-09-21 12:50:28 +0000
41@@ -261,7 +261,7 @@
42 def _get_lightdm_mock_path(self):
43 lib_path = get_mocks_library_path()
44 lightdm_mock_path = os.path.abspath(
45- os.path.join(lib_path, "LightDM", "liblightdm")
46+ os.path.join(lib_path, "IntegratedLightDM", "liblightdm")
47 )
48
49 if not os.path.exists(lightdm_mock_path):
50
51=== modified file 'tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txt'
52--- tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txt 2015-01-20 11:50:19 +0000
53+++ tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txt 2015-09-21 12:50:28 +0000
54@@ -14,5 +14,5 @@
55 OUTPUT_NAME lightdm-qt5-2)
56
57 install(TARGETS MockLightDM
58- DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/liblightdm
59+ DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/liblightdm
60 )

Subscribers

People subscribed via source and target branches