Merge lp:~canonical-platform-qa/ubiquity/update_failing_autopilot_tests into lp:ubiquity

[Christopher Lee]

Update failing autopilot tests so they pass.

Update failing autopilot tests so they pass.

I updated the tests to work based on my understanding of how the code has changed.

- Removed unneeded checks as the prepare-page has changed
- Bumped up a timeout that was causing a sporadic failure on my machine (VM speeds being the issue)
- Update label text to match new text.

[Max Brustkern (nuclearbob)]

The code looks reasonable to me. I'll try to verify the tests pass for me.

[Max Brustkern (nuclearbob)]

This is working for me.

review: Approve

=== modified file 'autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py'
--- autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py	2015-09-15 17:55:47 +0000
+++ autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py	2016-04-01 04:15:29 +0000
@@ -56,9 +56,10 @@
         'The software is subject to license terms included with its ' \
         'documentation.'.format(distro_flavor)
     stepPrepare['prepare_download_updates'] = \
-        'Download updates while installing'
+        'Download updates while installing {}'.format(distro_flavor)
     stepPrepare['prepare_nonfree_software'] = \
-        'Install this third-party software'
+        'Install third-party software for graphics and Wi-Fi hardware, ' \
+        'Flash, MP3 and other media'
     stepPrepare['prepare_network_connection'] = \
         'is connected to the Internet'
     stepPrepare['prepare_sufficient_space'] = \

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/__init__.py'
--- autopilot/ubiquity_autopilot_tests/tests/__init__.py	2015-09-05 12:56:03 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/__init__.py	2016-04-01 04:15:29 +0000
@@ -252,8 +252,11 @@
         preparing_page = self.main_window.select_single(
             'GtkAlignment', BuilderName='stepPrepare')
 
-        objList = ['prepare_best_results', 'prepare_foss_disclaimer',
-                   'prepare_download_updates', 'prepare_nonfree_software']
+        objList = [
+            'prepare_foss_disclaimer_license',
+            'prepare_download_updates',
+            'prepare_nonfree_software'
+        ]
         self.check_visible_object_with_label(objList)
 
         if updates:
@@ -268,15 +271,6 @@
                 'GtkCheckButton', BuilderName='prepare_nonfree_software')
             self.pointing_device.click_object(thrdprty_checkbutton)
 
-        self._check_preparing_statebox('prepare_network_connection',
-                                       visible=networkConnection)
-        # and sufficient space
-        self._check_preparing_statebox('prepare_sufficient_space',
-                                       visible=sufficientSpace)
-        # and power source
-        self._check_preparing_statebox('prepare_power_source',
-                                       visible=powerSource)
-
         self._check_page_titles()
         self._check_navigation_buttons()
 
@@ -644,7 +638,7 @@
         self._track_install_progress()
         print("First loop complete waiting for pbar to go back to 0")
         self.assertThat(progress_bar.fraction, Eventually(
-            Equals(0.0), timeout=180))
+            Equals(0.0), timeout=260))
         print("Now entering the second loop...........")
         # And now the install progress bar
         self._track_install_progress()
@@ -1002,45 +996,6 @@
         #                     "[Page:'{0}'] Expect page title to be visible "
         #                     "but it wasn't".format(self.current_step))
 
-    def _check_preparing_statebox(self, stateboxName, visible=True,
-                                  imagestock='gtk-yes'):
-        """ Checks the preparing page statebox's """
-        logger.debug("Running checks on {0} StateBox".format(stateboxName))
-        preparing_page = self.main_window.select_single(
-            'GtkAlignment', BuilderName='stepPrepare')
-        state_box = preparing_page.select_single(
-            'StateBox', BuilderName=stateboxName)
-        logger.debug('check({0}, {1})'.format(visible, imagestock))
-        logger.debug("Running checks.......")
-        if visible:
-            self.expectThat(state_box.visible, Equals(visible),
-                            "StateBox.check(): Expected {0} statebox to be "
-                            "visible but it wasn't"
-                            .format(state_box.name))
-            label = state_box.select_single('GtkLabel')
-            self.expectThat(label.label, NotEquals(u''),
-                            "[Page:'{0}'] Expected {1} Statebox's label to "
-                            "contain text but it didn't"
-                            .format(self.current_step, stateboxName))
-            self.expectThat(label.visible, Equals(visible),
-                            "[Page:'{0}'] Expected {1} Statebox label's "
-                            "visible property to be {2} "
-                            .format(self.current_step, stateboxName,
-                                    str(visible)))
-            self.expectIsInstance(label.label, str,
-                                  "[Page:'{0}'] Expected {1} Statebox's label "
-                                  "to be unicode but it wasn't"
-                                  .format(self.current_step, stateboxName))
-            image = state_box.select_single('GtkImage')
-            self.expectThat(image.stock, Equals(imagestock))
-            self.expectThat(image.visible, Equals(visible))
-
-        else:
-            self.expectThat(state_box.visible, Equals(False),
-                            "[Page:'{0}'] Expected {1} statebox to not be "
-                            "visible but it was"
-                            .format(self.current_step, stateboxName))
-
     def get_distribution(self, ):
         """Returns the name of the running distribution."""
         logger.debug("Detecting flavor")