Ubuntu Clock App

Merge lp:~sergiusens/ubuntu-clock-app/confinement_fixes into lp:ubuntu-clock-app/saucy

  1. confinement_fixes
  2. Merge into saucy
Proposed by Sergio Schvezov
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 228
Merged at revision: 227
Proposed branch: lp:~sergiusens/ubuntu-clock-app/confinement_fixes
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 55 lines (+3/-5)
4 files modified
apparmor/clock.json (+1/-0)
tests/autopilot/ubuntu_clock_app/tests/__init__.py (+1/-3)
ubuntu-clock-app.desktop (+0/-1)
ubuntu-clock-app.qml (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/ubuntu-clock-app/confinement_fixes
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Approve
Review via email: mp+190044@code.launchpad.net

Commit message

fix confinement issues

Description of the change

Test app http://people.canonical.com/~sergiusens/com.ubuntu.clock_0.7_all.click

To get the tests: phablet-click-test-setup (and apt-get install python-mock python-dateutil or run phablet-click-test-setup from lp:~sergiusens/phablet-tools/click_testing_python_modules)

Also run phablet-config autopilot --dbus-probe enable

Results:
$ phablet-test-run ubuntu_clock_app
adbd is already running as root
Loading tests from: /home/phablet/autopilot

Tests running...
__pthread_gettid -2
stop: Unknown instance:
initctl: Unknown instance: com.ubuntu.clock_clock_0.7
stop: Unknown instance:
initctl: Unknown instance: com.ubuntu.clock_clock_0.7
stop: Unknown instance:
initctl: Unknown instance: com.ubuntu.clock_clock_0.7
stop: Unknown instance:
initctl: Unknown instance: com.ubuntu.clock_clock_0.7
stop: Unknown instance:
initctl: Unknown instance: com.ubuntu.clock_clock_0.7
stop: Unknown instance:
initctl: Unknown instance: com.ubuntu.clock_clock_0.7

Ran 6 tests in 129.360s
OK

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

lgtm

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apparmor/clock.json'
2--- apparmor/clock.json 2013-10-04 17:55:01 +0000
3+++ apparmor/clock.json 2013-10-09 08:40:46 +0000
4@@ -1,5 +1,6 @@
5 {
6 "policy_groups": [
7+ "calendar",
8 "networking"
9 ],
10 "policy_version": 1.0
11
12=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
13--- tests/autopilot/ubuntu_clock_app/tests/__init__.py 2013-10-07 19:43:19 +0000
14+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py 2013-10-09 08:40:46 +0000
15@@ -27,8 +27,6 @@
16 from autopilot.input import Mouse, Touch, Pointer
17 from autopilot.platform import model
18 from autopilot.testcase import AutopilotTestCase
19-from autopilot.matchers import Eventually
20-from testtools.matchers import GreaterThan, Equals, Not, Is
21 from ubuntuuitoolkit import emulators as toolkit_emulators
22 from ubuntu_clock_app import emulators
23
24@@ -49,7 +47,7 @@
25 local_location = "../../ubuntu-clock-app.qml"
26 installed_location = "/usr/share/ubuntu-clock-app/ubuntu-clock-app.qml"
27 sqlite_dir = os.path.expanduser(
28- "~/.local/share/ubuntu-clock-app/Databases")
29+ "~/.local/share/com.ubuntu.clock/Databases")
30 backup_dir = sqlite_dir + ".backup"
31
32 def setUp(self):
33
34=== modified file 'ubuntu-clock-app.desktop'
35--- ubuntu-clock-app.desktop 2013-05-16 15:55:38 +0000
36+++ ubuntu-clock-app.desktop 2013-10-09 08:40:46 +0000
37@@ -1,5 +1,4 @@
38 [Desktop Entry]
39-Encoding=UTF-8
40 Version=1.0
41 Type=Application
42 Terminal=false
43
44=== modified file 'ubuntu-clock-app.qml'
45--- ubuntu-clock-app.qml 2013-09-26 19:04:31 +0000
46+++ ubuntu-clock-app.qml 2013-10-09 08:40:46 +0000
47@@ -35,7 +35,7 @@
48
49 ////////////////////////////////////////////////////////////////////////////////
50 // Properties of this page
51- applicationName: "ubuntu-clock-app"
52+ applicationName: "com.ubuntu.clock"
53
54 width: units.gu(50)
55 height: units.gu(75)

Subscribers

People subscribed via source and target branches