1c74b30 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix autopilot wizard test skipping the reporting page

1c74b30Lukáš Tinkl11 years ago

tests/autopilot/unity8/settings_wizard/__init__.py+7−2

compare with xenial

unifiedsplit

@@ -375,12 +375,17 @@ class WifiConnectPage(UbuntuUIToolkitCustomProxyObjectBase):

375 wizard = get_wizard(self)

376 next_page = wizard.get_current_page()

377 locationPageEnabled = True

378+ reportingPageEnabled = True

378 if next_page.objectName == 'locationPage':

379 if next_page.objectName == 'locationPage':

379 next_page = wizard.get_location_page()

380 next_page = wizard.get_location_page()

380 else:

381 else:

381 locationPageEnabled = False

382 locationPageEnabled = False

383+ if next_page.objectName == 'reportingPage':

382− next_page = wizard.get_reporting_page()

384+ next_page = wizard.get_reporting_page()

385+ else:

386+ reportingPageEnabled = False

387+ next_page = wizard.get_finished_page()

383− return locationPageEnabled, next_page

388+ return locationPageEnabled, reportingPageEnabled, next_page

384

389

385 def _get_notification(self, unity):

390 def _get_notification(self, unity):

386 logger.info('Waiting longer for notification object')

391 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):

80 password_page = next_page

81 wifi_connect_page = self._test_password_page(password_page)

83+ reporting_page = None

83− locationPageEnabled, next_page = self._test_wifi_connect_page(

84+ locationPageEnabled, reportingPageEnabled, next_page = self._test_wifi_connect_page(wifi_connect_page)

84− wifi_connect_page)

85 if locationPageEnabled:

86 location_page = next_page

87+ if reportingPageEnabled:

87− reporting_page = self._test_location_page(location_page)

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)

88 else:

94 else:

89− reporting_page = next_page

95+ finish_page = next_page

90− finish_page = self._test_reporting_page(reporting_page)

92 finish_page.finish()

97 finish_page.finish()

93 self.assertFalse(

98 self.assertFalse(