Ubuntu Terminal App

Merge lp:~nskaggs/ubuntu-terminal-app/polling-test-idea into lp:ubuntu-terminal-app

  1. polling-test-idea
  2. Merge into trunk
Proposed by Nicholas Skaggs
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 31
Merged at revision: 22
Proposed branch: lp:~nskaggs/ubuntu-terminal-app/polling-test-idea
Merge into: lp:ubuntu-terminal-app
Diff against target: 23 lines (+3/-3)
1 file modified
tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py (+3/-3)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-terminal-app/polling-test-idea
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Terminal Developers Pending
Review via email: mp+180173@code.launchpad.net

Commit message

Fix valueselector (missed in previous merge)
Fix for circlemenu

Description of the change

Fix valueselector (missed in previous merge)
Fix for circlemenu

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:31
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/18/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-precise-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-quantal-amd64-ci/18
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/18
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/13

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/18/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/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
2--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py 2013-08-13 23:33:07 +0000
3+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py 2013-08-14 15:28:10 +0000
4@@ -49,8 +49,8 @@
5 # ListItem.ValueSelector {
6 # objectName:
7 # values:
8- val_selector = lambda: self.main_view.select_single("ValueSelector", objectName=selector)
9- self.assertThat(val_selector, Eventually(Not(Is(None))))
10+ self.assertThat(lambda: self.main_view.select_single("ValueSelector", objectName=selector), Eventually(Not(Is(None))))
11+ val_selector = self.main_view.select_single("ValueSelector", objectName=selector)
12 self.pointing_device.click_object(val_selector)
13 rows = val_selector.select_single("QQuickColumn")
14 rects = rows.select_many("QQuickRectangle")
15@@ -114,7 +114,7 @@
16 """Make sure that Circle Menu is visible
17 on long tap"""
18 kterm = self.main_view.get_terminal_page()
19- self.pointing_device.click_object(kterm)
20+ self.pointing_device.move_to_object(kterm)
21 self.pointing_device.press()
22 sleep(2)
23 self.pointing_device.release()

Subscribers

People subscribed via source and target branches