Ubuntu Calculator App

Merge lp:~nik90/ubuntu-calculator-app/applicationname-fixes into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

  1. applicationname-fixes
  2. Merge into old_trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Mihir Soni
Approved revision: 176
Merged at revision: 176
Proposed branch: lp:~nik90/ubuntu-calculator-app/applicationname-fixes
Merge into: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target: 35 lines (+2/-3)
3 files modified
tests/autopilot/ubuntu_calculator_app/tests/__init__.py (+1/-1)
ubuntu-calculator-app.desktop (+0/-1)
ubuntu-calculator-app.qml (+1/-1)
To merge this branch: bzr merge lp:~nik90/ubuntu-calculator-app/applicationname-fixes
Reviewer Review Type Date Requested Status
Mihir Soni Approve
Sergio Schvezov (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+190060@code.launchpad.net

Commit message

Removes obselete encoding and changes application name to match convention followed by other apps

Description of the change

Removes obselete encoding and changes application name to match convention followed by other apps as stated in http://developer.ubuntu.com/publish/apps/security-policy-for-click-packages/.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:176
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/126/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/838
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/125
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/125
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/125
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/125

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/126/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

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

Tests running...
stop: Unknown instance:
__pthread_gettid -2
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3
initctl: Unknown instance: com.ubuntu.calculator_calculator_0.1.3

Ran 28 tests in 175.267s
OK

review: Approve
Revision history for this message
David Planella (dpm) wrote :

Looks good to me codewise, but I'm at a conference atm and I've not been able to test it at runtime.

Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good :)

Thanks for your time

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
2--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py 2013-10-04 17:44:56 +0000
3+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py 2013-10-09 09:17:41 +0000
4@@ -37,7 +37,7 @@
5 "ubuntu-calculator-app.qml"
6
7 sqlite_dir = os.path.expanduser(
8- "~/.local/share/ubuntu-calculator-app/Databases")
9+ "~/.local/share/com.ubuntu.calculator/Databases")
10 backup_dir = sqlite_dir + ".backup"
11
12 def setUp(self):
13
14=== modified file 'ubuntu-calculator-app.desktop'
15--- ubuntu-calculator-app.desktop 2013-05-18 09:52:21 +0000
16+++ ubuntu-calculator-app.desktop 2013-10-09 09:17:41 +0000
17@@ -1,5 +1,4 @@
18 [Desktop Entry]
19-Encoding=UTF-8
20 Version=1.0
21 Type=Application
22 Terminal=false
23
24=== modified file 'ubuntu-calculator-app.qml'
25--- ubuntu-calculator-app.qml 2013-05-01 17:15:28 +0000
26+++ ubuntu-calculator-app.qml 2013-10-09 09:17:41 +0000
27@@ -31,7 +31,7 @@
28 id: mainView
29 // objectName for functional testing purposes (autopilot-qt5)
30 objectName: "calculator"
31- applicationName: "ubuntu-calculator-app"
32+ applicationName: "com.ubuntu.calculator"
33
34 width: units.gu(50)
35 height: units.gu(75)

Subscribers

People subscribed via source and target branches