on xenial help sign in
Re-enable tests
commit8a93021f7999ba18d7c08e327f753b94c67483bb authorJosh Arenson <joshua.arenson@canonical.com> dateTue 19 May 2015, 13:51 (11 years ago) parent1277960
2 files changed+8−5
tests/CMakeLists.txt+2−2 tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py+6−3
tests/CMakeLists.txt+2−2
@@ -10,7 +10,7 @@ add_dependencies(qmltests qmlunittests qmluitests)
1010add_subdirectory(libs)
1111add_subdirectory(qmltests)
1212add_subdirectory(mocks)
13−#add_subdirectory(whitespace)
14−#add_subdirectory(plugins)
13+add_subdirectory(whitespace)
14+add_subdirectory(plugins)
1515add_subdirectory(utils)
1616add_subdirectory(uqmlscene)
tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py+6−3
@@ -36,6 +36,9 @@ class SkipThroughSettingsWizardTestCase(tests.UnityTestCase):
3636 password_page.select_security_option('Swipe')
3737 return password_page.continue_()
3838
39+ def _test_reporting_page(self, reporting_page):
40+ return reporting_page.continue_()
41+
3942 def _test_wifi_connect_page(self, wifi_connect_page):
4043 return wifi_connect_page.advance_page()
4144
@@ -47,8 +50,8 @@ class SkipThroughSettingsWizardTestCase(tests.UnityTestCase):
4750 else:
4851 password_page = next_page.skip()
4952 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
5253 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)
5455 finish_page.finish()
56+ self.assertFalse(
57+ self.wizard_helper.is_settings_wizard_enabled())