Merge lp:~om26er/dialer-app/lil_fix_for_smart_dial_test into lp:~iahmad/dialer-app/smart-dialing-test

Proposed by Omer Akram
Status: Merged
Approved by: I Ahmad
Approved revision: 93
Merged at revision: 93
Proposed branch: lp:~om26er/dialer-app/lil_fix_for_smart_dial_test
Merge into: lp:~iahmad/dialer-app/smart-dialing-test
Diff against target: 21 lines (+2/-2)
1 file modified
tests/autopilot/dialer_app/tests/test_calls.py (+2/-2)
To merge this branch: bzr merge lp:~om26er/dialer-app/lil_fix_for_smart_dial_test
Reviewer Review Type Date Requested Status
I Ahmad Approve
Review via email: mp+205709@code.launchpad.net

Description of the change

use Eventually, and bring back a missing import

To post a comment you must log in.
Revision history for this message
I Ahmad (iahmad) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/dialer_app/tests/test_calls.py'
2--- tests/autopilot/dialer_app/tests/test_calls.py 2014-02-08 20:08:28 +0000
3+++ tests/autopilot/dialer_app/tests/test_calls.py 2014-02-11 07:33:43 +0000
4@@ -17,7 +17,7 @@
5 import time
6
7 from autopilot.matchers import Eventually
8-from testtools.matchers import Equals, NotEquals
9+from testtools.matchers import Equals, NotEquals, MismatchError
10 from testtools import skipIf, skipUnless
11
12 from dialer_app.tests import DialerAppTestCase
13@@ -216,7 +216,7 @@
14
15 # should show called number in title page
16 lcp = self.app.select_single(objectName="pageLiveCall")
17- self.assertThat(lcp.title, Equals(contact))
18+ self.assertThat(lcp.title, Eventually(Equals(contact)))
19
20 def wait_for_incoming_call(self):
21 """Wait up to 5 s for an incoming phone call"""

Subscribers

People subscribed via source and target branches

to all changes: