8a93021 · unity8 · git.iko.soy

on xenial help sign in

Re-enable tests

8a93021Josh Arenson11 years ago

tests/CMakeLists.txt+2−2

@@ -10,7 +10,7 @@ add_dependencies(qmltests qmlunittests qmluitests)

10add_subdirectory(libs)

11add_subdirectory(qmltests)

12add_subdirectory(mocks)

13−#add_subdirectory(whitespace)

13+add_subdirectory(whitespace)

14−#add_subdirectory(plugins)

14+add_subdirectory(plugins)

15add_subdirectory(utils)

16add_subdirectory(uqmlscene)

tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py+6−3

@@ -36,6 +36,9 @@ class SkipThroughSettingsWizardTestCase(tests.UnityTestCase):

36 password_page.select_security_option('Swipe')

37 return password_page.continue_()

39+ def _test_reporting_page(self, reporting_page):

40+ return reporting_page.continue_()

41+

39 def _test_wifi_connect_page(self, wifi_connect_page):

42 def _test_wifi_connect_page(self, wifi_connect_page):

40 return wifi_connect_page.advance_page()

43 return wifi_connect_page.advance_page()

@@ -47,8 +50,8 @@ class SkipThroughSettingsWizardTestCase(tests.UnityTestCase):

47 else:

50 else:

48 password_page = next_page.skip()

51 password_page = next_page.skip()

49 wifi_connect_page = self._test_password_page(password_page)

52 wifi_connect_page = self._test_password_page(password_page)

50− # FIXME This _will_ not work without a mock as the behavior is

51− # dependent on weather or not there is a connection to a wifi network

52 reporting_page = self._test_wifi_connect_page(wifi_connect_page)

53 reporting_page = self._test_wifi_connect_page(wifi_connect_page)

53− finish_page = reporting_page.continue_()

54+ finish_page = self._test_reporting_page(reporting_page)

54 finish_page.finish()

55 finish_page.finish()

56+ self.assertFalse(

57+ self.wizard_helper.is_settings_wizard_enabled())