@@ -23,6 +23,7 @@ from unity8.shell import emulators
24from autopilot import logging as autopilot_logging
24from autopilot import logging as autopilot_logging
25from autopilot.introspection import dbus
25from autopilot.introspection import dbus
26+from testtools.matchers import MatchesAny, Equals
26from ubuntuuitoolkit import emulators as toolkit_emulators
27from ubuntuuitoolkit import emulators as toolkit_emulators
@@ -145,7 +146,8 @@ class Dash(emulators.UnityEmulatorBase):
145 page_header = self._get_page_header()
146 page_header = self._get_page_header()
146 search_container = page_header.select_single(
147 search_container = page_header.select_single(
147 'QQuickItem', objectName='searchContainer')
148 'QQuickItem', objectName='searchContainer')
148− search_container.state.wait_for('narrowActive')
149+ search_container.state.wait_for(
150+ MatchesAny(Equals('narrowActive'), Equals('active')))
149 return search_container.select_single(toolkit_emulators.TextField)
151 return search_container.select_single(toolkit_emulators.TextField)