pay-ui

Merge lp:~dobey/pay-ui/mir-app-test into lp:pay-ui

mir-app-test
Merge into first-branch

Proposed by dobey on 2015-02-26

Status:	Merged
Approved by:	dobey on 2015-03-16
Approved revision:	105
Merged at revision:	116
Proposed branch:	lp:~dobey/pay-ui/mir-app-test
Merge into:	lp:pay-ui
Diff against target:	74 lines (+26/-9) 3 files modified HACKING (+1/-1) manifest.json.in (+1/-0) tests/autopilot/pay_ui/tests/__init__.py (+24/-8)
To merge this branch:	bzr merge lp:~dobey/pay-ui/mir-app-test
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Alejandro J. Cura (community)		2015-02-26	Approve on 2015-03-16
PS Jenkins bot	continuous-integration		Approve on 2015-03-13
Review via email: mp+251163@code.launchpad.net

Commit Message

Run using ubuntu-app-test when the display manager is Mir.
Fix a missing \ in HACKING file for adt-run command.

Description of the Change

This changes the autopilot tests to run the app using ubuntu-app-test when Mir is the display manager being used. This depends on https://code.launchpad.net/~ted/ubuntu-app-launch/app-test/+merge/250661 to be able to run.

PS Jenkins bot (ps-jenkins) wrote on 2015-02-26:

FAILED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/377
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-ci/22/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-ci/22/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/125/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-26:

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/126/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-ci/23
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/799
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/379
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18405

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/126/rebuild

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-03-06:

PASSED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/128/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-ci/25
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/807
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/417
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18641

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/128/rebuild

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-03-06:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/129/rebuild

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-03-12:

FAILED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/29/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/132/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-03-12:

PASSED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/133/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-14.09-touch/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-ci/30
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/10
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18806

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/133/rebuild

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-03-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/134/rebuild

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-03-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/135/rebuild

review: Approve (continuous-integration)

Alejandro J. Cura (alecu) wrote on 2015-03-16:

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Diego Sarmentero

dobey

 === modified file 'HACKING'
 --- HACKING	2015-02-13 14:04:36 +0000
 +++ HACKING	2015-03-06 19:25:36 +0000
@@ -81,7 +81,7 @@
      $ adt-run --click-source . \
        --click ./com.canonical.payui_15.01.*_amd64.click \
        -o /tmp/adt-payui-test -U --apt-pocket proposed \
--      --setup-commands ubuntu-touch-session
++      --setup-commands ubuntu-touch-session \
        --- qemu ~/adt-vivid-amd64-cloud.img
  To examine the test results, which are in subunit format, additional tools are
 === modified file 'manifest.json.in'
 --- manifest.json.in	2015-02-10 15:58:29 +0000
 +++ manifest.json.in	2015-03-06 19:25:36 +0000
@@ -26,6 +26,7 @@
                  "python3-fixtures",
                  "python3-testtools",
                  "qtdeclarative5-ubuntu-ui-toolkit-plugin",
++                "ubuntu-app-test",
                  "ubuntu-sdk-libs"
+             ]
+         }
 === modified file 'tests/autopilot/pay_ui/tests/__init__.py'
 --- tests/autopilot/pay_ui/tests/__init__.py	2015-02-12 18:21:36 +0000
 +++ tests/autopilot/pay_ui/tests/__init__.py	2015-03-06 19:25:36 +0000
@@ -14,6 +14,7 @@
  # You should have received a copy of the GNU General Public License
  # along with this program. If not, see <http://www.gnu.org/licenses/>.
++import autopilot
  import fixtures
  import json
  import os
@@ -86,14 +87,29 @@
              installed_directory, 'qml', 'payui.qml')
          desktop_file_path = os.path.join(
              installed_directory, 'payui_payui.desktop')
--        return self.launch_test_application(
--            uutk.base.get_qmlscene_launch_command(),
--            qml_file_path,
--            '--desktop_file_hint=%s' % desktop_file_path,
--            '--transparent',
--            'purchase://com.example.testapp',
--            app_type='qt',
--            emulator_base=uutk.UbuntuUIToolkitCustomProxyObjectBase)
++        # Check if we are using Mir or not.
++        if autopilot.platform.get_display_server() == "MIR":
++            return self.launch_test_application(
++                'ubuntu-app-test',
++                uutk.base.get_qmlscene_launch_command(),
++                '-testability',
++                qml_file_path,
++                '--desktop_file_hint=%s' % desktop_file_path,
++                '--transparent',
++                'purchase://com.example.testapp',
++                app_type='qt',
++                emulator_base=uutk.UbuntuUIToolkitCustomProxyObjectBase)
++        else:
++            return self.launch_test_application(
++                uutk.base.get_qmlscene_launch_command(),
++                '-testability',
++                qml_file_path,
++                '--desktop_file_hint=%s' % desktop_file_path,
++                '--transparent',
++                'purchase://com.example.testapp',
++                app_type='qt',
++                emulator_base=uutk.UbuntuUIToolkitCustomProxyObjectBase)
++
      def get_arch_triplet(self):
          """Return the dpkg-architecture triplet for shared objects."""