Ubuntu Calculator App

Merge lp:~rpadovani/ubuntu-calculator-app/fixApDirectory into lp:ubuntu-calculator-app

  1. fixApDirectory
  2. Merge into trunk
Proposed by Riccardo Padovani on 2015-04-14
Status: Merged
Approved by: Riccardo Padovani on 2015-04-14
Approved revision: 166
Merged at revision: 165
Proposed branch: lp:~rpadovani/ubuntu-calculator-app/fixApDirectory
Merge into: lp:ubuntu-calculator-app
Diff against target: 32 lines (+2/-2)
3 files modified
CMakeLists.txt (+1/-0)
app/CMakeLists.txt (+0/-1)
tests/autopilot/ubuntu_calculator_app/tests/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~rpadovani/ubuntu-calculator-app/fixApDirectory
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-04-14
Łukasz Zemczak 2015-04-14 Approve on 2015-04-14
Bartosz Kosiorek Approve on 2015-04-14
Review via email: mp+256175@code.launchpad.net

Commit Message

Move AP directory to the root

Description of the Change

Move AP directory to the root

To post a comment you must log in.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Łukasz Zemczak (sil2100) wrote :

It might be all that's needed, I didn't do that yet as I didn't know if paths wouldn't need to be changed for the tests to actually work (there are also some unit tests there). The CMake seems to need some tweaking though.

review: Needs Fixing
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Bartosz Kosiorek (gang65) wrote :

To fix autopilot tests please apply following patch:

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py 2015-01-10 14:16:24 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py 2015-04-14 18:14:15 +0000
@@ -36,9 +36,8 @@
     the ubuntu-calculator-app tests.

     """
-
- local_location = os.path.dirname(os.path.dirname(os.getcwd()))
-
+ local_location = os.path.join(os.path.dirname(os.path.dirname(os.getcwd())),
+ 'app')
     local_location_qml = os.path.join(local_location,
                                       'ubuntu-calculator-app.qml')

Bartosz Kosiorek (gang65) wrote :

Without that path it is impossible to run autopilot tests locally.

review: Needs Fixing
Riccardo Padovani (rpadovani) wrote :

Thanks Łukasz, thanks Bartosz, I fixed both issues.

Bartosz Kosiorek (gang65) wrote :

Thanks. Lgtm

review: Approve
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Łukasz Zemczak (sil2100) wrote :

Looks good indeed, thanks guys! We already poked the right people to actually make phablet-click-test-setup a bit smarter (and the CI autopilot smoketesting infrastructure as well), but until that happens this is actually a fix that works.

Cheers!

review: Approve
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
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 'CMakeLists.txt'
2--- CMakeLists.txt 2015-01-28 05:48:04 +0000
3+++ CMakeLists.txt 2015-04-14 19:17:46 +0000
4@@ -100,4 +100,5 @@
5 enable_testing()
6
7 add_subdirectory(app)
8+add_subdirectory(tests)
9 add_subdirectory(po)
10
11=== modified file 'app/CMakeLists.txt'
12--- app/CMakeLists.txt 2015-03-11 09:13:18 +0000
13+++ app/CMakeLists.txt 2015-04-14 19:17:46 +0000
14@@ -14,4 +14,3 @@
15 add_subdirectory(graphics)
16 add_subdirectory(ui)
17 add_subdirectory(upstreamcomponents)
18-add_subdirectory(tests)
19
20=== renamed directory 'app/tests' => 'tests'
21=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
22--- app/tests/autopilot/ubuntu_calculator_app/tests/__init__.py 2015-01-10 14:16:24 +0000
23+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py 2015-04-14 19:17:46 +0000
24@@ -40,7 +40,7 @@
25 local_location = os.path.dirname(os.path.dirname(os.getcwd()))
26
27 local_location_qml = os.path.join(local_location,
28- 'ubuntu-calculator-app.qml')
29+ 'app/ubuntu-calculator-app.qml')
30
31 installed_location_qml = os.path.join('/usr/share/ubuntu-calculator-app/',
32 'ubuntu-calculator-app.qml')

Subscribers

People subscribed via source and target branches