Merge lp:~nuclearbob/ubiquity/ubiquity-testing into lp:ubiquity

[Max Brustkern]

Pass custom proxy classes directly instead of locating them by name.

This branch passes many custom proxy classes directly instead of attempting to locate them by name.

[lp:~nuclearbob/ubiquity/ubiquity-testing]

6482. By Max Brustkern on 2016-08-10

Removed debug assert

[Max Brustkern (nuclearbob)]

Can I get a review on this? We need some updates or all the tests will continue failing on this, blocking us from seeing any actual potential test failures.

[Max Brustkern (nuclearbob)]

I think we'll want these changes in at least xenial, and possibly older versions as well.

=== modified file 'autopilot/ubiquity_autopilot_tests/emulators/gtkcontrols.py'
--- autopilot/ubiquity_autopilot_tests/emulators/gtkcontrols.py	2016-06-09 13:50:52 +0000
+++ autopilot/ubiquity_autopilot_tests/emulators/gtkcontrols.py	2016-08-10 20:53:14 +0000
@@ -16,7 +16,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 from autopilot.input import Pointer, Mouse, Keyboard
-from ubiquity_autopilot_tests.emulators import AutopilotGtkEmulatorBase
+from ubiquity_autopilot_tests.emulators import (
+    AutopilotGtkEmulatorBase,
+    gtkaccessible,
+)
 from ubiquity_autopilot_tests.tools.compare import expectThat
 import logging
 import re
@@ -356,7 +359,7 @@
         treeviews = []
         # This is going to be slow! but what more can we do? we can't put
         # an in range arg on the select_many call :-(
-        for tree in root.select_many('GtkTreeViewAccessible'):
+        for tree in root.select_many(gtkaccessible.GtkTreeViewAccessible):
             # There will be some tree's that don't have a globalRect property
             # no idea why but we can just ignore them as we can be sure
             # this isn't the one we want.

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/__init__.py'
--- autopilot/ubiquity_autopilot_tests/tests/__init__.py	2016-06-09 13:50:52 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/__init__.py	2016-08-10 20:53:14 +0000
@@ -34,6 +34,20 @@
     Pointer
 )
 from ubiquity_autopilot_tests.emulators import AutopilotGtkEmulatorBase
+from ubiquity_autopilot_tests.emulators.gtkcontainers import (
+    GtkAlignment,
+    GtkBox,
+)
+from ubiquity_autopilot_tests.emulators.gtkcontrols import (
+    GtkButton,
+    GtkCheckButton,
+    GtkLabel,
+    GtkProgressBar,
+    GtkTreeView,
+)
+from ubiquity_autopilot_tests.emulators.gtktoplevel import (
+    GtkWindow,
+)
 from ubiquity_autopilot_tests.testcase import UbiquityTestCase
 from ubiquity_autopilot_tests.configs import english_label_conf
 from ubiquity_autopilot_tests.configs.partconfig import (
@@ -92,7 +106,7 @@
 
     @property
     def main_window(self, ):
-        return self.app.select_single('GtkWindow', name='live_installer')
+        return self.app.select_single(GtkWindow, name='live_installer')
 
     def go_to_next_page(self, wait=False):
         """ Goes to the next page of Ubiquity installer
@@ -107,7 +121,7 @@
 
         """
         logger.debug('go_to_next_page(wait={0})'.format(wait))
-        nxt_button = self.main_window.select_single('GtkButton', name='next')
+        nxt_button = self.main_window.select_single(GtkButton, name='next')
         nxt_button.click()
 
         if wait:
@@ -142,7 +156,7 @@
                             Eventually(Equals(True), timeout=1200))
 
         page_title = self.main_window.select_single(
-            'GtkLabel', name='page_title')
+            GtkLabel, name='page_title')
         self.assertThat(page_title.label,
                         Eventually(NotEquals(self.current_page_title),
                                    timeout=240))
@@ -155,7 +169,7 @@
             checks.
 
         """
-        nxt_button = self.main_window.select_single('GtkButton', name='next')
+        nxt_button = self.main_window.select_single(GtkButton, name='next')
         nxt_button.click()
 
     def welcome_page_tests(self, lang=None):
@@ -176,8 +190,8 @@
         # selecting an install language
         logger.debug("Selecting stepLanguage page object")
         welcome_page = self.main_window.select_single(
-            'GtkBox', name='stepLanguage')
-        treeview = welcome_page.select_single('GtkTreeView')
+            GtkBox, name='stepLanguage')
+        treeview = welcome_page.select_single(GtkTreeView)
         # lets get all items
         treeview_items = treeview.get_all_items()
         # first lets check all the items are non-empty unicode strings
@@ -248,7 +262,7 @@
         logger.debug("run_preparing_page_tests()")
         logger.debug("selecting stepPrepare page")
         preparing_page = self.main_window.select_single(
-            'GtkAlignment', BuilderName='stepPrepare')
+            GtkAlignment, BuilderName='stepPrepare')
 
         objList = [
             'prepare_foss_disclaimer_license',
@@ -260,13 +274,13 @@
         if updates:
             logger.debug("Selecting install updates")
             update_checkbutton = preparing_page.select_single(
-                'GtkCheckButton', BuilderName='prepare_download_updates')
+                GtkCheckButton, BuilderName='prepare_download_updates')
             self.pointing_device.click_object(update_checkbutton)
 
         if thirdParty:
             logger.debug("Selecting install thirdparty software")
             thrdprty_checkbutton = preparing_page.select_single(
-                'GtkCheckButton', BuilderName='prepare_nonfree_software')
+                GtkCheckButton, BuilderName='prepare_nonfree_software')
             self.pointing_device.click_object(thrdprty_checkbutton)
 
         self._check_page_titles()
@@ -360,7 +374,7 @@
         self.check_visible_object_with_label(config.visible_options)
         self.check_hidden_object_with_label(config.hidden_options)
         install_type_page = self.main_window.select_single(
-            'GtkAlignment', BuilderName='stepPartAsk')
+            GtkAlignment, BuilderName='stepPartAsk')
         if option_name:
             obj = install_type_page.select_single(BuilderName=option_name)
             self.pointing_device.click_object(obj)
@@ -383,7 +397,7 @@
                      .format(crypto_password))
         logger.debug('Selecting stepPartCrypto page object')
         crypto_page = self.main_window.select_single(
-            'GtkAlignment', BuilderName='stepPartCrypto')
+            GtkAlignment, BuilderName='stepPartCrypto')
 
         items = ['verified_crypto_label', 'crypto_label', 'crypto_description',
                  'crypto_warning', 'crypto_extra_label', 'crypto_extra_time',
@@ -412,8 +426,8 @@
         logger.debug("run_custom_partition_page_tests()")
         logger.debug("Selecting the stepPartAdvanced page object")
         custom_page = self.main_window.select_single(
-            'GtkAlignment', BuilderName='stepPartAdvanced')
-        treeview = custom_page.select_single('GtkTreeView')
+            GtkAlignment, BuilderName='stepPartAdvanced')
+        treeview = custom_page.select_single(GtkTreeView)
         self.expectThat(treeview.visible, Equals(True),
                         "[Page:'{0}'] Partition tree view was not visible")
         obj_list = ['partition_button_new', 'partition_button_delete',
@@ -461,7 +475,7 @@
             partition_dialog.set_file_system_type(elem['FileSystemType'])
             partition_dialog.set_mount_point(elem['MountPoint'])
             ok_button = partition_dialog.select_single(
-                'GtkButton', BuilderName='partition_dialog_okbutton')
+                GtkButton, BuilderName='partition_dialog_okbutton')
             self.pointing_device.click_object(ok_button)
             self.assertThat(partition_dialog.visible,
                             Eventually(Equals(False)),
@@ -486,7 +500,7 @@
 
         logger.debug("Selecting stepLocation page object")
         location_page = self.main_window.select_single(
-            'GtkBox', BuilderName='stepLocation')
+            GtkBox, BuilderName='stepLocation')
         location_map = location_page.select_single('CcTimezoneMap')
         self.assertThat(location_map.visible, Equals(True),
                         "Expected location map to be visible but it wasn't")
@@ -513,9 +527,9 @@
 
         logger.debug("Selecting the stepKeyboardCOnf page object")
         keyboard_page = self.main_window.select_single(
-            'GtkAlignment',
+            GtkAlignment,
             BuilderName='stepKeyboardConf')
-        treeviews = keyboard_page.select_many('GtkTreeView')
+        treeviews = keyboard_page.select_many(GtkTreeView)
         # lets check all the keyboard tree items for the selected language
         # TODO: we should probably test at some point try changing the keyboard
         #       layout to a different language/locale/layout and see if
@@ -582,7 +596,7 @@
         self._update_page_titles()
         logger.debug("Selecting stepUserInfo page")
         user_info_page = self.main_window.select_single(
-            'GtkBox',
+            GtkBox,
             BuilderName='stepUserInfo')
 
         objects = ['hostname_label', 'username_label', 'password_label',
@@ -626,7 +640,7 @@
         # self.expectThat(webkitwindow.visible, Equals(True))
         # print("Webkit window found and is visible")
         print("Selecting Progress bar")
-        progress_bar = self.main_window.select_single('GtkProgressBar',
+        progress_bar = self.main_window.select_single(GtkProgressBar,
                                                       name='install_progress')
 
         # Copying files progress bar
@@ -721,7 +735,7 @@
         logger.debug("_track_install_progress_bar()")
         print("_track_install_progress()")
         print("selecting progress bar")
-        progress_bar = self.main_window.select_single('GtkProgressBar',
+        progress_bar = self.main_window.select_single(GtkProgressBar,
                                                       name='install_progress')
         progress = 0.0
         while progress < 1.0:
@@ -789,7 +803,7 @@
             pass
 
     def _get_dialog_message(self, dlg_object):
-        dialog_labels = dlg_object.select_many('GtkLabel')
+        dialog_labels = dlg_object.select_many(GtkLabel)
         message = ''
         for gtklabel in dialog_labels:
             # only add labels longer than 'Continue' so we avoid button labels
@@ -802,9 +816,9 @@
         """ adds a new partition """
         logger.debug("_add_new_partition()")
         custom_page = self.main_window.select_single(
-            'GtkAlignment',
+            GtkAlignment,
             BuilderName='stepPartAdvanced')
-        tree_view = custom_page.select_single('GtkTreeView')
+        tree_view = custom_page.select_single(GtkTreeView)
         item = tree_view.select_item(u'  free space')
         self.pointing_device.click_object(item)
         self.assertThat(item.selected, Equals(True),
@@ -822,9 +836,9 @@
         """
         logger.debug("Checking partition was created.....")
         custom_page = self.main_window.select_single(
-            'GtkAlignment',
+            GtkAlignment,
             BuilderName='stepPartAdvanced')
-        tree_view = custom_page.select_single('GtkTreeView')
+        tree_view = custom_page.select_single(GtkTreeView)
         # assert a new row has been added to the partition table
         total_rows = self._update_table_row_count(config)
         logger.debug("TOTAL NUMBER OF ROWS: {0}".format(self.part_table_rows))
@@ -897,16 +911,16 @@
         logger.debug("check_window_constants({0}, {1}, {2}, {3})".format(
             continue_button, back_button, quit_button, skip_button))
 
-        con_button = self.main_window.select_single('GtkButton', name='next')
+        con_button = self.main_window.select_single(GtkButton, name='next')
         self.assertThat(con_button.visible, Equals(continue_button))
 
-        bk_button = self.main_window.select_single('GtkButton', name='back')
+        bk_button = self.main_window.select_single(GtkButton, name='back')
         self.assertThat(bk_button.visible, Equals(back_button))
 
-        qt_button = self.main_window.select_single('GtkButton', name='quit')
+        qt_button = self.main_window.select_single(GtkButton, name='quit')
         self.assertThat(qt_button.visible, Equals(quit_button))
 
-        skp_button = self.main_window.select_single('GtkButton', name='skip')
+        skp_button = self.main_window.select_single(GtkButton, name='skip')
         self.assertThat(skp_button.visible, Equals(skip_button))
 
     def _update_current_step(self, name):
@@ -920,9 +934,9 @@
         " Returns number of rows in table"
 
         custom_page = self.main_window.select_single(
-            'GtkAlignment',
+            GtkAlignment,
             BuilderName='stepPartAdvanced')
-        tree_view = custom_page.select_single('GtkTreeView')
+        tree_view = custom_page.select_single(GtkTreeView)
         num = tree_view.get_number_of_rows()
         if num == self.total_number_partitions:
             # TODO: assert 'free space' changes to a partition
@@ -953,12 +967,12 @@
     def _update_page_titles(self, ):
         self.previous_page_title = self.current_page_title
         self.current_page_title = self.main_window.select_single(
-            'GtkLabel',
+            GtkLabel,
             BuilderName='page_title').label
 
     def _check_page_titles(self, ):
         current_page_title = self.main_window.select_single(
-            'GtkLabel',
+            GtkLabel,
             BuilderName='page_title')
         if self.current_step in self.english_config:
             if self.english_install and (