Unity 8

Merge lp:~saviq/unity8/workaround-lp1238645 into lp:unity8

  1. workaround-lp1238645
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp:~saviq/unity8/workaround-lp1238645
Merge into: lp:unity8
Diff against target: 31 lines (+12/-2)
1 file modified
tests/autopilot/unity8/shell/tests/__init__.py (+12/-2)
To merge this branch: bzr merge lp:~saviq/unity8/workaround-lp1238645
Reviewer Review Type Date Requested Status
Michał Sawicz Disapprove
PS Jenkins bot (community) continuous-integration Needs Fixing
Sergio Schvezov Needs Fixing
Review via email: mp+190724@code.launchpad.net

Commit message

Work around maliit-server being required (and not necessarily started) during unity8 tests.

To post a comment you must log in.
lp:~saviq/unity8/workaround-lp1238645 updated
450. By Michał Sawicz

import++

451. By Michał Sawicz

tearDown++

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:451
http://jenkins.qa.ubuntu.com/job/unity8-ci/1373/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4955
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2860
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/396
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1373
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1373/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1372
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/830
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/830/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2862
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2862/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2378
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2418

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1373/rebuild

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

call to super on your teardown or use addCleanup

review: Needs Fixing
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py 2013-10-11 16:29:34 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py 2013-10-11 18:25:28 +0000
@@ -102,6 +102,7 @@
         self._setup_display_details()

     def tearDown(self):
+ super(UnityTestCase, self).tearDown()
         #### FIXME: This is a work around re: lp:1238645 ####
         subprocess.call(["/sbin/initctl", "stop", "maliit-server"])
         ####

Get's me this (which are test failures instead of test code tearDown ones):
Ran 22 tests in 521.616s
FAILED (failures=5)

lp:~saviq/unity8/workaround-lp1238645 updated
452. By Michał Sawicz

super++

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:452
http://jenkins.qa.ubuntu.com/job/unity8-ci/1378/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4963
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/401
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1378
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1377
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/838
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/838/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2873
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2873/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2386
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2426

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1378/rebuild

review: Needs Fixing (continuous-integration)
lp:~saviq/unity8/workaround-lp1238645 updated
453. By Michał Sawicz

merge trunk

454. By Michał Sawicz

Only apply the workarounds on devices.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:454
http://jenkins.qa.ubuntu.com/job/unity8-ci/1382/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4975
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2883
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/405
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1382
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1382/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1381
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/850
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/850/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2885
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2885/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2398
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2439

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1382/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:455
http://jenkins.qa.ubuntu.com/job/unity8-ci/1383/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4976
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1383
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1383/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/851
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/851/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2886
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2886/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2399
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2440

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1383/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Integrated into lp:~veebers/unity8/ap_launch_unity_with_upstart

review: Disapprove

Unmerged revisions

454. By Michał Sawicz

Only apply the workarounds on devices.

453. By Michał Sawicz

merge trunk

452. By Michał Sawicz

super++

451. By Michał Sawicz

tearDown++

450. By Michał Sawicz

import++

449. By Michał Sawicz

Work around maliit-server being required (and not started) during unity8 tests.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
2--- tests/autopilot/unity8/shell/tests/__init__.py 2013-10-11 10:05:00 +0000
3+++ tests/autopilot/unity8/shell/tests/__init__.py 2013-10-12 18:59:00 +0000
4@@ -31,6 +31,7 @@
5 from autopilot.display import Display
6 import logging
7 import os.path
8+import subprocess
9 from testtools.matchers import Equals, NotEquals
10
11 from unity8 import (
12@@ -89,8 +90,17 @@
13 self._qml_mock_enabled = True
14
15 #### FIXME: This is a work around re: lp:1238417 ####
16- from autopilot.input import _uinput
17- _uinput._touch_device = _uinput.create_touch_device()
18+ if model() != "Desktop":
19+ from autopilot.input import _uinput
20+ _uinput._touch_device = _uinput.create_touch_device()
21+ ####
22+
23+ #### FIXME: This is a work around re: lp:1238645 ####
24+ if model() != "Desktop":
25+ subprocess.call(["/sbin/initctl", "start", "maliit-server"])
26+ def stopMaliit():
27+ subprocess.call(["/sbin/initctl", "stop", "maliit-server"])
28+ self.addCleanup(stopMaliit)
29 ####
30
31 self.touch = Touch.create()

Subscribers

People subscribed via source and target branches