@@ -23,6 +23,7 @@ from unity8.shell import emulators
2323
2424from autopilot import logging as autopilot_logging
2525from autopilot.introspection import dbus
26+from testtools.matchers import MatchesAny, Equals
2627from ubuntuuitoolkit import emulators as toolkit_emulators
2728
2829
@@ -145,7 +146,8 @@ class Dash(emulators.UnityEmulatorBase):
145146 page_header = self._get_page_header()
146147 search_container = page_header.select_single(
147148 'QQuickItem', objectName='searchContainer')
148− search_container.state.wait_for('narrowActive')
149+ search_container.state.wait_for(
150+ MatchesAny(Equals('narrowActive'), Equals('active')))
149151 return search_container.select_single(toolkit_emulators.TextField)
150152
151153