on xenial help sign in
revert some changes in AP which are not required any more
6aac816Michael Zanetti
tests/autopilot/unity8/shell/emulators/dash.py+1−9
@@ -161,7 +161,7 @@ class GenericScopeView(emulators.UnityEmulatorBase):
161 raise emulators.UnityEmulatorException(
161 raise emulators.UnityEmulatorException(
162 'No category found with name {}'.format(category))
162 'No category found with name {}'.format(category))
163
163
164−class DashApps(emulators.UnityEmulatorBase):
164+class DashApps(GenericScopeView):
165 def get_applications(self, category):
165 def get_applications(self, category):
166 """Return the list of applications on a category.
166 """Return the list of applications on a category.
167
167
@@ -177,11 +177,3 @@ class DashApps(emulators.UnityEmulatorBase):
177 if card.objectName != 'cardToolCard':
177 if card.objectName != 'cardToolCard':
178 result.append(card)
178 result.append(card)
179 return result
179 return result
180−
181− def _get_category_element(self, category):
182− try:
183− return self.wait_select_single(
184− 'Base', objectName='dashCategory{}'.format(category))
185− except dbus.StateNotFoundError:
186− raise emulators.UnityEmulatorException(
187− 'No category found with name {}'.format(category))
tests/autopilot/unity8/shell/tests/test_emulators.py+1
@@ -128,6 +128,7 @@ class DashEmulatorTestCase(DashBaseTestCase):
128 scope_id = 'clickscope'
128 scope_id = 'clickscope'
129 scope = self.dash.open_scope(scope_id)
129 scope = self.dash.open_scope(scope_id)
130 self._assert_scope_is_opened(scope, scope_id)
130 self._assert_scope_is_opened(scope, scope_id)
131+ self.assertIsInstance(scope, dash_emulators.DashApps)
131
132
132
133
133class GenericScopeViewEmulatorTestCase(DashBaseTestCase):
134class GenericScopeViewEmulatorTestCase(DashBaseTestCase):