Sudoku App

Merge lp:~sergiusens/sudoku-app/click into lp:sudoku-app

  1. click
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Michael Hall
Approved revision: 137
Merged at revision: 130
Proposed branch: lp:~sergiusens/sudoku-app/click
Merge into: lp:sudoku-app
Diff against target: 110 lines (+26/-9)
6 files modified
apparmor/sudoku.json (+4/-0)
debian/rules (+2/-2)
manifest.json (+15/-0)
sudoku-app.desktop (+1/-2)
sudoku-app.qml (+1/-1)
tests/autopilot/sudoku_app/tests/__init__.py (+3/-4)
To merge this branch: bzr merge lp:~sergiusens/sudoku-app/click
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Michael Hall Approve
Review via email: mp+190231@code.launchpad.net

Commit message

upstream click

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

LGTM

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

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/sudoku-app-autolanding/14/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/866
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-autolanding/14
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-autolanding/14
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-autolanding/14
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-autolanding/14

review: Needs Fixing (continuous-integration)
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
=== added directory 'apparmor'
=== added file 'apparmor/sudoku.json'
--- apparmor/sudoku.json 1970-01-01 00:00:00 +0000
+++ apparmor/sudoku.json 2013-10-09 20:19:55 +0000
@@ -0,0 +1,4 @@
1{
2 "policy_groups": [],
3 "policy_version": 1.0
4}
0\ No newline at end of file5\ No newline at end of file
16
=== modified file 'debian/rules'
--- debian/rules 2013-07-05 22:11:01 +0000
+++ debian/rules 2013-10-09 20:19:55 +0000
@@ -15,11 +15,11 @@
15override_dh_install:15override_dh_install:
16# tests/autopilot/install_autopilot.sh $(CURDIR)16# tests/autopilot/install_autopilot.sh $(CURDIR)
17 dh_install --fail-missing17 dh_install --fail-missing
18 appname=sudoku-app; \18 appname=com.ubuntu.sudoku; \
19 for pofile in $(shell find ./po -name "*.po"); do \19 for pofile in $(shell find ./po -name "*.po"); do \
20 pofilename="$${pofile##*/}"; \20 pofilename="$${pofile##*/}"; \
21 langcode="$${pofilename%.*}"; \21 langcode="$${pofilename%.*}"; \
22 localedir="debian/$$appname/usr/share/locale/$$langcode/LC_MESSAGES"; \22 localedir="debian/sudoku-app/usr/share/locale/$$langcode/LC_MESSAGES"; \
23 mkdir -p $$localedir; \23 mkdir -p $$localedir; \
24 mofile="$$localedir/$$appname.mo"; \24 mofile="$$localedir/$$appname.mo"; \
25 msgfmt -o $$mofile $$pofile; \25 msgfmt -o $$mofile $$pofile; \
2626
=== added file 'manifest.json'
--- manifest.json 1970-01-01 00:00:00 +0000
+++ manifest.json 2013-10-09 20:19:55 +0000
@@ -0,0 +1,15 @@
1{
2 "description": "Sudoku game for Ubuntu devices",
3 "framework": "ubuntu-sdk-13.10",
4 "hooks": {
5 "sudoku": {
6 "apparmor": "apparmor/sudoku.json",
7 "desktop": "sudoku-app.desktop"
8 }
9 },
10 "icon": "SudokuGameIcon.png",
11 "maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
12 "name": "com.ubuntu.sudoku",
13 "title": "sudoku",
14 "version": "0.4.3"
15}
016
=== modified file 'sudoku-app.desktop'
--- sudoku-app.desktop 2013-06-14 11:17:43 +0000
+++ sudoku-app.desktop 2013-10-09 20:19:55 +0000
@@ -1,6 +1,5 @@
1[Desktop Entry]1[Desktop Entry]
2Name=Sudoku2Name=Sudoku
3Encoding=UTF-8
4Version=1.03Version=1.0
5Comment=Sudoku Game for Ubuntu Touch4Comment=Sudoku Game for Ubuntu Touch
6Exec=qmlscene /usr/share/sudoku-app/sudoku-app.qml5Exec=qmlscene /usr/share/sudoku-app/sudoku-app.qml
@@ -9,4 +8,4 @@
9Type=Application8Type=Application
10X-Ubuntu-Touch=true9X-Ubuntu-Touch=true
11X-Ubuntu-StageHint=SideStage10X-Ubuntu-StageHint=SideStage
12X-Ubuntu-Gettext-Domain=sudoku-app11X-Ubuntu-Gettext-Domain=com.ubuntu.sudoku
1312
=== modified file 'sudoku-app.qml'
--- sudoku-app.qml 2013-09-29 22:06:59 +0000
+++ sudoku-app.qml 2013-10-09 20:19:55 +0000
@@ -12,7 +12,7 @@
12 id: mainView12 id: mainView
13 // objectName for functional testing purposes (autopilot-qt5)13 // objectName for functional testing purposes (autopilot-qt5)
14 objectName: "sudoku"14 objectName: "sudoku"
15 applicationName: "sudoku-app"15 applicationName: "com.ubuntu.sudoku"
1616
17 property real resizeFactor: units.gu(50)/units.gu(75)17 property real resizeFactor: units.gu(50)/units.gu(75)
18 property real blockDistance: mainView.width/mainView.height < mainView.resizeFactor ? mainView.width/200: units.gu(50)/200;18 property real blockDistance: mainView.width/mainView.height < mainView.resizeFactor ? mainView.width/200: units.gu(50)/200;
1919
=== modified file 'tests/autopilot/sudoku_app/tests/__init__.py'
--- tests/autopilot/sudoku_app/tests/__init__.py 2013-10-03 17:08:24 +0000
+++ tests/autopilot/sudoku_app/tests/__init__.py 2013-10-09 20:19:55 +0000
@@ -15,8 +15,6 @@
15from autopilot.input import Mouse, Touch, Pointer15from autopilot.input import Mouse, Touch, Pointer
16from autopilot.platform import model16from autopilot.platform import model
17from autopilot.testcase import AutopilotTestCase17from autopilot.testcase import AutopilotTestCase
18from autopilot.matchers import Eventually
19from testtools.matchers import GreaterThan, Equals
2018
21from ubuntuuitoolkit import emulators as toolkit_emulators19from ubuntuuitoolkit import emulators as toolkit_emulators
22from sudoku_app import emulators20from sudoku_app import emulators
@@ -36,7 +34,8 @@
36 scenarios = [('with touch', dict(input_device_class=Touch))]34 scenarios = [('with touch', dict(input_device_class=Touch))]
3735
38 local_location = "../../sudoku-app.qml"36 local_location = "../../sudoku-app.qml"
39 sqlite_dir = os.path.expanduser("~/.local/share/sudoku-app/Databases")37 sqlite_dir = os.path.expanduser(
38 "~/.local/share/com.ubuntu.sudoku/Databases")
40 backup_dir = sqlite_dir + ".backup"39 backup_dir = sqlite_dir + ".backup"
4140
42 def setUp(self):41 def setUp(self):
@@ -71,7 +70,7 @@
7170
72 def launch_test_click(self):71 def launch_test_click(self):
73 self.app = self.launch_click_package(72 self.app = self.launch_click_package(
74 'com.ubuntu.sudoku-app',73 'com.ubuntu.sudoku',
75 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)74 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
7675
77 def temp_move_sqlite_db(self):76 def temp_move_sqlite_db(self):

Subscribers

People subscribed via source and target branches