unity-webapps-qml

Merge lp:~abreu-alexandre/unity-webapps-qml/bug-1228208 into lp:unity-webapps-qml

  1. bug-1228208
  2. Merge into trunk
Proposed by Alexandre Abreu
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 67
Merged at revision: 67
Proposed branch: lp:~abreu-alexandre/unity-webapps-qml/bug-1228208
Merge into: lp:unity-webapps-qml
Diff against target: 53 lines (+11/-3)
3 files modified
tests/integration/autopilot/unity_webapps_qml/tests/test_hud.py (+5/-1)
tests/integration/autopilot/unity_webapps_qml/tests/test_launcher.py (+3/-1)
tests/integration/autopilot/unity_webapps_qml/tests/test_mediaplayer.py (+3/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/unity-webapps-qml/bug-1228208
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Robert Bruce Park (community) Approve
Review via email: mp+187098@code.launchpad.net

Commit message

ensure_unity_is_running should not be used on touch

Description of the change

ensure_unity_is_running should not be used on touch

To post a comment you must log in.
Revision history for this message
Robert Bruce Park (robru) wrote :

lgtm

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

PASSED: Continuous integration, rev:67
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-armhf-ci/51

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-webapps-qml-ci/51/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/integration/autopilot/unity_webapps_qml/tests/test_hud.py'
2--- tests/integration/autopilot/unity_webapps_qml/tests/test_hud.py 2013-08-01 14:34:14 +0000
3+++ tests/integration/autopilot/unity_webapps_qml/tests/test_hud.py 2013-09-23 20:01:25 +0000
4@@ -11,6 +11,8 @@
5 from testtools.matchers import Equals, GreaterThan, NotEquals
6 from autopilot.matchers import Eventually
7
8+from autopilot import platform
9+
10 from unity.emulators.icons import HudLauncherIcon
11 from unity.emulators import ensure_unity_is_running
12
13@@ -27,7 +29,9 @@
14
15 def setUp(self):
16 super(UnityWebappsHudTestCase, self).setUp()
17- ensure_unity_is_running()
18+ # On Touch the dbus unity if does is not exposed
19+ if platform.model() == 'Desktop':
20+ ensure_unity_is_running()
21 self.launch_with_html_filepath(self.get_html_test_file())
22
23 def test_addAction(self):
24
25=== modified file 'tests/integration/autopilot/unity_webapps_qml/tests/test_launcher.py'
26--- tests/integration/autopilot/unity_webapps_qml/tests/test_launcher.py 2013-09-18 17:12:20 +0000
27+++ tests/integration/autopilot/unity_webapps_qml/tests/test_launcher.py 2013-09-23 20:01:25 +0000
28@@ -32,7 +32,9 @@
29
30 def setUp(self):
31 super(UnityWebappsLauncherTestCase, self).setUp()
32- ensure_unity_is_running()
33+ # On Touch the dbus unity if does is not exposed
34+ if platform.model() == 'Desktop':
35+ ensure_unity_is_running()
36 self.launch_with_html_filepath(self.get_html_test_file())
37
38 @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
39
40=== modified file 'tests/integration/autopilot/unity_webapps_qml/tests/test_mediaplayer.py'
41--- tests/integration/autopilot/unity_webapps_qml/tests/test_mediaplayer.py 2013-09-18 17:12:20 +0000
42+++ tests/integration/autopilot/unity_webapps_qml/tests/test_mediaplayer.py 2013-09-23 20:01:25 +0000
43@@ -32,7 +32,9 @@
44
45 def setUp(self):
46 super(UnityWebappsMediaplayerTestCase, self).setUp()
47- ensure_unity_is_running()
48+ # On Touch the dbus unity if does is not exposed
49+ if platform.model() == 'Desktop':
50+ ensure_unity_is_running()
51 self.launch_with_html_filepath(self.get_html_test_file())
52
53 @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")

Subscribers

People subscribed via source and target branches

to all changes: