Merged home-lens-tests-to-wait_for-feature into hud-tests-to-wait_for-feature.

(bzr r2220.7.6)

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/autopilot/autopilot/matchers/__init__.py b/tests/autopilot/autopilot/matchers/__init__.py
index 7f946139d..f0ac66fbd 100644
--- a/tests/autopilot/autopilot/matchers/__init__.py
+++ b/tests/autopilot/autopilot/matchers/__init__.py
@@ -17,15 +17,15 @@ class Eventually(Matcher):
 def __init__(self, matcher):
 super(Eventually, self).__init__()
 match_fun = getattr(matcher, 'match', None)
- if not match_fun:
+ if match_fun is None or not callable(match_fun):
 raise TypeError("Eventually must be called with a testtools matcher argument.")
 self.matcher = matcher
 
 def match(self, value):
 wait_fun = getattr(value, 'wait_for', None)
- if wait_fun is None:
+ if wait_fun is None or not callable(wait_fun):
 raise TypeError("Eventually can only be used against autopilot attributes that have a wait_for funtion.")
- value.wait_for(self.matcher)
+ wait_fun(self.matcher)
 
 def __str__(self):
 return "Eventually " + str(self.matcher)