Merge lp:~josharenson/unity8/location_page_test into lp:unity8

[Josh Arenson]

Add handling for the location page to the autopilot settings wizard test

* Are there any related MPs required for this MP to build/function as expected? Please list.
Yes. lp:~josharenson/unity8/settings_wizard_tests

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[lp:~josharenson/unity8/location_page_test]

1794. By Josh Arenson on 2015-05-21

Restore location file

1795. By Josh Arenson on 2015-05-21

Weird fu

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1795
http://jenkins.qa.ubuntu.com/job/unity8-ci/5753/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/31
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/32
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20697

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5753/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1795
http://jenkins.qa.ubuntu.com/job/unity8-ci/5928/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/250/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/209
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/170/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/250
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/250/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21631

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5928/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

How am i supposed to test this?

Running
  autopilot3 run unity8.settings_wizard.tests.test_settings_wizard.SkipThroughSettingsWizardTestCase.test_skipping_through_wizard
I never get the location page, do i have to reset something? Shouldn't that reset be part of the autopilot test?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1795
http://jenkins.qa.ubuntu.com/job/unity8-ci/6086/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/393/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/325
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/287/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/393
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/393/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21955

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6086/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
I could not, one is supposed to use the devel-proposed-customized-here channel to test this, but the image is too old and the packages created by the CI system are uninstallable there. Since this is only AP related I'm approving it anyway and we will see how to fix it later in case it fails.

 * Did CI run pass?
As much as it usually passes

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'tests/autopilot/unity8/settings_wizard/__init__.py'
--- tests/autopilot/unity8/settings_wizard/__init__.py	2015-05-21 16:52:37 +0000
+++ tests/autopilot/unity8/settings_wizard/__init__.py	2015-05-21 16:52:38 +0000
@@ -74,6 +74,10 @@
         return self.wait_select_single(
             objectName='wifiPage', visible='True')
 
+    def get_location_page(self):
+        return self.wait_select_single(
+            objectName='locationPage', visible='True')
+
     def get_reporting_page(self):
         return self.wait_select_single(
             objectName='reportingPage', visible='True')
@@ -367,6 +371,17 @@
         return self._get_network(ssid).select_single(
             'CheckBox', visible='True')
 
+    def _get_next_page(self):
+        wizard = get_wizard(self)
+        next_page = wizard.get_current_page()
+        locationPageEnabled = True
+        if next_page.objectName == 'locationPage':
+            next_page = wizard.get_location_page()
+        else:
+            locationPageEnabled = False
+            next_page = wizard.get_reporting_page()
+        return locationPageEnabled, next_page
+
     def _get_notification(self, unity):
         logger.info('Waiting longer for notification object')
         with override_proxy_timeout(unity, 30):
@@ -377,14 +392,14 @@
         return self.wait_select_single(
             'StackButton', text='Back', visible='True')
 
+    def _get_continue_button(self):
+        return self.wait_select_single(
+            'StackButton', text='Continue', visible='True')
+
     def _get_skip_button(self):
         return self.wait_select_single(
             'StackButton', text='Skip', visible='True')
 
-    def _get_continue_button(self):
-        return self.wait_select_single(
-            'StackButton', text='Continue', visible='True')
-
     def is_any_network_checked(self):
         networks = self._get_all_networks()
         for network in networks:
@@ -413,7 +428,35 @@
     @autopilot.logging.log_action(logger.info)
     def skip(self):
         self.pointing_device.click_object(self._get_skip_button())
-        return get_wizard(self).get_reporting_page()
+        return self._get_next_page()
+
+    @autopilot.logging.log_action(logger.info)
+    def continue_(self):
+        self.pointing_device.click_object(self._get_continue_button())
+        return self._get_next_page()
+
+
+class LocationPage(UbuntuUIToolkitCustomProxyObjectBase):
+    """Helper class to interact with the LocationPage"""
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        name = introspection.get_classname_from_path(path)
+        if name == b'Page':
+            if state['objectName'][1] == 'locationPage':
+                return True
+        return False
+
+    def _get_back_button(self):
+        return self.select_single('StackButton', text='Back')
+
+    def _get_continue_button(self):
+        return self.select_single('StackButton', text='Continue')
+
+    @autopilot.logging.log_action(logger.info)
+    def back(self):
+        self.pointing_device.click_object(self._get_back_button())
+        return get_wizard(self).get_wifi_connect_page()
 
     @autopilot.logging.log_action(logger.info)
     def continue_(self):

=== modified file 'tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py'
--- tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py	2015-05-21 16:52:37 +0000
+++ tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py	2015-05-21 16:52:38 +0000
@@ -45,6 +45,9 @@
         self.assertEqual(default_selection, DEFAULT_LANGUAGE)
         return language_page.continue_()
 
+    def _test_location_page(self, location_page):
+        return location_page.continue_()
+
     def _test_password_page(self, password_page):
         """ Check default selection for password type and change
         password type to swipe to keep this test as uncomplicated
@@ -57,6 +60,9 @@
     def _test_reporting_page(self, reporting_page):
         return reporting_page.continue_()
 
+    def _test_sim_page(self, sim_page):
+        return sim_page.skip()
+
     def _test_wifi_connect_page(self, wifi_connect_page):
         if wifi_connect_page.is_any_network_checked() or not \
            wifi_connect_page.is_any_network_found():
@@ -67,13 +73,22 @@
     def test_skipping_through_wizard(self):
         """ Most basic test of the settings wizard. Skip all skipable pages """
         sim_inserted, next_page = self._test_language_page()
-        if sim_inserted:
+        if not sim_inserted:
+            sim_page = next_page
+            password_page = self._test_sim_page(sim_page)
+        else:
             password_page = next_page
-        else:
-            password_page = next_page.skip()
         wifi_connect_page = self._test_password_page(password_page)
-        reporting_page = self._test_wifi_connect_page(wifi_connect_page)
+
+        locationPageEnabled, next_page = self._test_wifi_connect_page(
+            wifi_connect_page)
+        if locationPageEnabled:
+            location_page = next_page
+            reporting_page = self._test_location_page(location_page)
+        else:
+            reporting_page = next_page
         finish_page = self._test_reporting_page(reporting_page)
+
         finish_page.finish()
         self.assertFalse(
             self.wizard_helper.is_settings_wizard_enabled())