@@ -166,11 +166,11 @@ class Unity8TestCase(AutopilotTestCase):
166166 self._proxy = None
167167
168168 def assertUnityReady(self):
169+ dash = self.get_dash()
170+ home_scope = dash.get_scope('home')
171+
169172 # FIXME! There is a huge timeout here for when we're doing CI on
170173 # VMs. See lp:1203715
171− home_scope = self.get_dash_home_scope()
172− # home_scope_is_loaded = lambda: home_scope.isCurrent
173− # home_scope_is_current = lambda: get_home_scope().isLoaded
174174 self.assertThat(
175175 home_scope.isLoaded,
176176 Eventually(Equals(True), timeout=40)
@@ -182,15 +182,6 @@ class Unity8TestCase(AutopilotTestCase):
182182 self.assertThat(dash, NotEquals(None))
183183 return dash
184184
185− # change this to get_scope(name='home') and add the .scope to it
186− def get_dash_home_scope(self):
187− dash = self.get_dash()
188− dash_content = dash.select_single(
189− 'QQuickListView',
190− objectName='dashContentList'
191− )
192− return dash_content.select_single('QQuickLoader', scopeId='home.scope')
193−
194185 @property
195186 def main_window(self):
196187 return MainWindow(self._proxy)