git.iko.soy/unity8
on xenial help sign in
Fix autopilot wizard test skipping the reporting page

Approved by: Albert Astals Cid, PS Jenkins bot

commit1c74b30a264bb5cddb511f9c182ed443248494ec authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 21 Oct 2015, 11:51 (11 years ago) parent53fd0c942b21ab
2 files changed+17−7
compare with xenial
unifiedsplit
tests/autopilot/unity8/settings_wizard/__init__.py+7−2 tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py+10−5
tests/autopilot/unity8/settings_wizard/__init__.py+7−2
@@ -375,12 +375,17 @@ class WifiConnectPage(UbuntuUIToolkitCustomProxyObjectBase):
375375 wizard = get_wizard(self)
376376 next_page = wizard.get_current_page()
377377 locationPageEnabled = True
378+ reportingPageEnabled = True
378379 if next_page.objectName == 'locationPage':
379380 next_page = wizard.get_location_page()
380381 else:
381382 locationPageEnabled = False
382− next_page = wizard.get_reporting_page()
383− return locationPageEnabled, next_page
383+ if next_page.objectName == 'reportingPage':
384+ next_page = wizard.get_reporting_page()
385+ else:
386+ reportingPageEnabled = False
387+ next_page = wizard.get_finished_page()
388+ return locationPageEnabled, reportingPageEnabled, next_page
384389
385390 def _get_notification(self, unity):
386391 logger.info('Waiting longer for notification object')
tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py+10−5
@@ -80,14 +80,19 @@ class SkipThroughSettingsWizardTestCase(tests.UnityTestCase):
8080 password_page = next_page
8181 wifi_connect_page = self._test_password_page(password_page)
8282
83− locationPageEnabled, next_page = self._test_wifi_connect_page(
84− wifi_connect_page)
83+ reporting_page = None
84+ locationPageEnabled, reportingPageEnabled, next_page = self._test_wifi_connect_page(wifi_connect_page)
8585 if locationPageEnabled:
8686 location_page = next_page
87− reporting_page = self._test_location_page(location_page)
87+ if reportingPageEnabled:
88+ reporting_page = self._test_location_page(location_page)
89+ else:
90+ finish_page = next_page
91+
92+ if reporting_page is not None:
93+ finish_page = self._test_reporting_page(reporting_page)
8894 else:
89− reporting_page = next_page
90− finish_page = self._test_reporting_page(reporting_page)
95+ finish_page = next_page
9196
9297 finish_page.finish()
9398 self.assertFalse(