Unity 8

Merge lp:~saviq/unity8/add-ap-data into lp:unity8

  1. add-ap-data
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Michal Hruby
Approved revision: 468
Merged at revision: 470
Proposed branch: lp:~saviq/unity8/add-ap-data
Merge into: lp:unity8
Diff against target: 81 lines (+26/-2)
4 files modified
debian/unity8-fake-env.install (+1/-0)
tests/autopilot/unity8/__init__.py (+16/-1)
tests/autopilot/unity8/shell/tests/__init__.py (+4/-1)
tests/mocks/CMakeLists.txt (+5/-0)
To merge this branch: bzr merge lp:~saviq/unity8/add-ap-data
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michal Hruby (community) Approve
Review via email: mp+191382@code.launchpad.net

Commit message

Ship a camera-app.desktop file and use a custom XDG_DATA_DIRS for testing.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

+1

review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote :

Aborted a run for r466.

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

FAILED: Continuous integration, rev:466
http://jenkins.qa.ubuntu.com/job/unity8-ci/1424/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/5051
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2989/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/447/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1424/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1423/console
    None: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1221/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/926
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/926/artifact/work/output/*zip*/output.zip
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2991/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1424/rebuild

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

FAILED: Continuous integration, rev:467
http://jenkins.qa.ubuntu.com/job/unity8-ci/1425/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/5052
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2990/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2293
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1425
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1425/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1424
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/927
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/927/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2992
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2992/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2498/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2542/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1425/rebuild

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

FAILED: Continuous integration, rev:468
http://jenkins.qa.ubuntu.com/job/unity8-ci/1434/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/5067
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/3006
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2302
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1434
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1434/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1433
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/942
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/942/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/3008
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/3008/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2513
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2557
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/37
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/33

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1434/rebuild

review: Needs Fixing (continuous-integration)
lp:~saviq/unity8/add-ap-data updated
469. By Michał Sawicz

Fix paths.

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

FAILED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/unity8-ci/1441/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/5076
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/3017
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1441
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1441/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1440
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/951
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/951/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/3019
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/3019/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2526
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2569
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/72
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/71

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1441/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 'debian/unity8-fake-env.install'
2--- debian/unity8-fake-env.install 2013-06-26 10:15:58 +0000
3+++ debian/unity8-fake-env.install 2013-10-16 21:44:14 +0000
4@@ -1,1 +1,2 @@
5 usr/lib/*/unity8/qml/mocks
6+usr/share/unity8/mocks
7
8=== modified file 'tests/autopilot/unity8/__init__.py'
9--- tests/autopilot/unity8/__init__.py 2013-07-23 09:54:32 +0000
10+++ tests/autopilot/unity8/__init__.py 2013-10-16 21:44:14 +0000
11@@ -52,7 +52,11 @@
12 if running_installed_tests():
13 mock_path = "qml/mocks/"
14 else:
15- mock_path = "../lib/x86_64-linux-gnu/unity8/qml/mocks/"
16+ mock_path = os.path.join(
17+ "../lib/",
18+ sysconfig.get_config_var('MULTIARCH'),
19+ "/unity8/qml/mocks/"
20+ )
21 lib_path = get_lib_path()
22 ld_library_path = os.path.abspath(
23 os.path.join(
24@@ -83,6 +87,17 @@
25 raise RuntimeError("Unable to locate %s binary: %r" % (binary, e))
26 return binary_path
27
28+def get_data_dirs():
29+ """Prepend a mock data path to XDG_DATA_DIRS."""
30+ data_path = os.path.abspath(
31+ os.path.join(os.path.dirname(__file__),
32+ running_installed_tests() and "/usr/share/unity8/mocks/data" or "../../mocks/data"
33+ ))
34+ xdg_path = os.getenv("XDG_DATA_DIRS")
35+ if xdg_path:
36+ return "{0}:{1}".format(data_path, xdg_path)
37+ else:
38+ return data_path
39
40 def get_grid_size():
41 grid_size = os.getenv('GRID_UNIT_PX')
42
43=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
44--- tests/autopilot/unity8/shell/tests/__init__.py 2013-10-14 19:18:53 +0000
45+++ tests/autopilot/unity8/shell/tests/__init__.py 2013-10-16 21:44:14 +0000
46@@ -41,6 +41,7 @@
47 get_binary_path,
48 get_mocks_library_path,
49 get_default_extra_mock_libraries,
50+ get_data_dirs
51 )
52 from unity8.shell.emulators import UnityEmulatorBase
53 from unity8.shell.emulators.dash import Dash
54@@ -120,7 +121,9 @@
55 self._proxy = None
56 self._lightdm_mock_type = None
57 self._qml_mock_enabled = True
58- self._environment = {}
59+ self._environment = {
60+ 'XDG_DATA_DIRS': get_data_dirs()
61+ }
62
63 #### FIXME: This is a work around re: lp:1238417 ####
64 if model() != "Desktop":
65
66=== modified file 'tests/mocks/CMakeLists.txt'
67--- tests/mocks/CMakeLists.txt 2013-08-20 18:13:35 +0000
68+++ tests/mocks/CMakeLists.txt 2013-10-16 21:44:14 +0000
69@@ -7,3 +7,8 @@
70 add_subdirectory(QMenuModel)
71 add_subdirectory(Ubuntu)
72 add_subdirectory(Unity)
73+
74+install(
75+ DIRECTORY data
76+ DESTINATION ${SHELL_APP_DIR}/mocks
77+)
78
79=== added directory 'tests/mocks/data'
80=== added directory 'tests/mocks/data/applications'
81=== added file 'tests/mocks/data/applications/camera-app.desktop'

Subscribers

People subscribed via source and target branches