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

[Riccardo Padovani]

Move AP directory to the root

Move AP directory to the root

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:164
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/302/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2598/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/81/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/24/console

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

review: Needs Fixing (continuous-integration)

[Łukasz Zemczak (sil2100)]

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)]

PASSED: Continuous integration, rev:165
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/303/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2599
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2599/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/82
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/25

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

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)]

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

review: Needs Fixing

[Riccardo Padovani (rpadovani)]

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

[Bartosz Kosiorek (gang65)]

Thanks. Lgtm

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:166
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/304/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2602
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2602/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/83
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/26

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

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

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)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calculator-app-autolanding/127/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2604
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2604/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-autolanding/27
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-autolanding/17

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-01-28 05:48:04 +0000
+++ CMakeLists.txt	2015-04-14 19:17:46 +0000
@@ -100,4 +100,5 @@
 enable_testing()
 
 add_subdirectory(app)
+add_subdirectory(tests)
 add_subdirectory(po)

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-03-11 09:13:18 +0000
+++ app/CMakeLists.txt	2015-04-14 19:17:46 +0000
@@ -14,4 +14,3 @@
 add_subdirectory(graphics)
 add_subdirectory(ui)
 add_subdirectory(upstreamcomponents)
-add_subdirectory(tests)

=== renamed directory 'app/tests' => 'tests'
=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
--- app/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 19:17:46 +0000
@@ -40,7 +40,7 @@
     local_location = os.path.dirname(os.path.dirname(os.getcwd()))
 
     local_location_qml = os.path.join(local_location,
-                                      'ubuntu-calculator-app.qml')
+                                      'app/ubuntu-calculator-app.qml')
 
     installed_location_qml = os.path.join('/usr/share/ubuntu-calculator-app/',
                                           'ubuntu-calculator-app.qml')