Merge lp:~dpniel/ubiquity/check_partitions into lp:ubiquity

[Dan Chapman ]

After creating a manual partition, test now checks that the mount point, FS type and size are displayed and correct

[Jean-Baptiste Lallement (jibel)]

Approved, thanks!

review: Approve

=== modified file 'autopilot/ubiquity_autopilot_tests/configs/partconfig.py'
--- autopilot/ubiquity_autopilot_tests/configs/partconfig.py	2013-11-19 09:07:08 +0000
+++ autopilot/ubiquity_autopilot_tests/configs/partconfig.py	2013-11-22 12:32:25 +0000
@@ -121,7 +121,7 @@
 
     /tmp = 200MB Ext4
 
-    /home = Ext4 take up available sapce
+    /home = Ext4 take up available space
 
     /opt = 500MB Ext3
 

=== added file 'autopilot/ubiquity_autopilot_tests/exception.py'
--- autopilot/ubiquity_autopilot_tests/exception.py	1970-01-01 00:00:00 +0000
+++ autopilot/ubiquity_autopilot_tests/exception.py	2013-11-22 12:32:25 +0000
@@ -0,0 +1,22 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013
+#
+# Author: Daniel Chapman [e-mail]
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# 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/>.
+
+
+class NonFatalErrors(AssertionError):
+    """ Exception class for raising non fatal errors
+    """

=== modified file 'autopilot/ubiquity_autopilot_tests/testcase.py'
--- autopilot/ubiquity_autopilot_tests/testcase.py	2013-11-19 09:07:08 +0000
+++ autopilot/ubiquity_autopilot_tests/testcase.py	2013-11-22 12:32:25 +0000
@@ -15,6 +15,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/>.
+import unittest
+import traceback
+import logging
+
 from autopilot.testcase import AutopilotTestCase
 from testtools.testcase import MismatchError
 from testtools.matchers import (
@@ -24,12 +28,11 @@
     Is,
     IsInstance
     )
-import unittest
 from testtools.content import text_content
-import traceback
+
 from ubiquity_autopilot_tests.tools import compare
-from ubiquity_autopilot_tests.tools._exc import NonFatalErrors
-import logging
+from ubiquity_autopilot_tests.exception import NonFatalErrors
+
 
 logger = logging.getLogger(__name__)
 

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/__init__.py'
--- autopilot/ubiquity_autopilot_tests/tests/__init__.py	2013-11-19 11:52:06 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/__init__.py	2013-11-22 12:32:25 +0000
@@ -511,7 +511,7 @@
             self.assertThat(partition_dialog.visible,
                             Eventually(Equals(False)),
                             "Partition dialog did not close")
-            self._check_partition_created(elem['MountPoint'])
+            self._check_partition_created(elem)
         self._check_page_titles()
         self._check_navigation_buttons()
 
@@ -704,29 +704,68 @@
         time.sleep(2)
         logger.debug('_add_new_partition complete')
 
-    def _check_partition_created(self, mountPoint):
-        """ Checks that the partition was created properly """
-        time.sleep(5)
-        # TODO: This needs fixing
+    def _check_partition_created(self, config):
+        """ Checks that the partition was created properly
+        """
+        #before checking lets just wait a little while to ensure everything
+        # has finished loading, this doesn't affect outcome
+        time.sleep(7)
+        logger.debug("Checking partition was created.....")
         custom_page = self.main_window.select_single(
             'GtkAlignment',
             BuilderName='stepPartAdvanced')
         tree_view = custom_page.select_single('GtkTreeView')
         items = tree_view.get_all_items()
-        print('partition_tree_items')
-        print('-' * 78)
-        for item in items:
-            if item.accessible_name == u'':
-                print('empty item ------------')
-            else:
-                print(item.accessible_name)
-        print('-' * 78)
-
-        #root = self.get_root_instance()
-        #item = root.select_single('GtkTextCellAccessible',
-        #                          accessible_name=mountPoint)
-        #item.visible.wait_for(True)
-        #assert item is not None
+        fsFormat = config['FileSystemType']
+        mount_point = config['MountPoint']
+        size_obj = config['PartitionSize']
+        if mount_point:
+            index = next((index for index, value in enumerate(items)
+                          if mount_point == value.accessible_name), None)
+            self.assertIsNotNone(index,
+                                 "Could not get index for '{0}' tree item"
+                                 .format(mount_point))
+            logger.debug("Found index for {0} tree item".format(mount_point))
+            fs_item = tree_view.select_item_by_index(index - 1)
+            mount_item = tree_view.select_item_by_index(index)
+            size_item = tree_view.select_item_by_index(index + 1)
+        else:
+            index = next((index for index, value in enumerate(items)
+                          if fsFormat.lower() == value.accessible_name), None)
+            self.assertIsNotNone(index,
+                                 "Could not get index for {0} FS tree item"
+                                 .format(fsFormat))
+            logger.debug("Found index for {0} tree item".format(fsFormat))
+            fs_item = tree_view.select_item_by_index(index)
+            mount_item = tree_view.select_item_by_index(index + 1)
+            size_item = tree_view.select_item_by_index(index + 2)
+
+        self.expectThat(fsFormat.lower(), Equals(fs_item.accessible_name))
+        self.expectThat(fs_item.visible, Equals(True),
+                        "[Page: '{0}'] Expected {0} to be visible but "
+                        "it wasn't".format(fs_item.accessible_name))
+
+        if mount_point:
+            # Fail the test if we don't have correct mount point
+            self.assertThat(mount_point,
+                            Equals(mount_item.accessible_name))
+            self.expectThat(mount_item.visible, Equals(True),
+                            "[Page: '{0}'] Expected {0} to be visible but "
+                            "it wasn't".format(mount_item.accessible_name))
+
+        if size_obj:
+            self.expectThat(
+                size_obj, Equals(
+                    int(size_item.accessible_name.strip(' MB'))),
+                "[Page:'{0}'] Expected partition size to be "
+                "{1}MB but instead it's {2}.".format(
+                    self.current_step,
+                    str(size_obj),
+                    size_item.accessible_name))
+            self.expectThat(size_item.visible, Equals(True),
+                            "[Page: '{0}'] Expected {0} to be visible but "
+                            " it wasn't".format(size_item.accessible_name))
+            logger.debug("Partition created")
 
     def _check_navigation_buttons(self, continue_button=True, back_button=True,
                                   quit_button=True, skip_button=False):

=== removed file 'autopilot/ubiquity_autopilot_tests/tools/_exc.py'
--- autopilot/ubiquity_autopilot_tests/tools/_exc.py	2013-11-19 09:07:08 +0000
+++ autopilot/ubiquity_autopilot_tests/tools/_exc.py	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-__author__ = 'dan'
-
-
-class NonFatalErrors(AssertionError):
-    """ Exception class for raising non fatal errors
-    """