Merge into trunk : fix_tests : Code : ubuntu-system-settings

Reviewer	Review Type	Date Requested	Status
Sebastien Bacher (community)		2014-04-01	Approve on 2014-04-11
PS Jenkins bot	continuous-integration	2014-04-01	Approve on 2014-04-08
Review via email: mp+213691@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/691/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:648
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/692/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3799
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3384/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3817
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3817/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3386
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3386/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5752/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4636

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/692/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/693/rebuild

review: Approve (continuous-integration)

Revision history for this message

Omer Akram (om26er) wrote on 2014-03-10: Posted in a previous version of this proposal

#

\o/

On Tue, Mar 11, 2014 at 4:17 AM, PS Jenkins bot <
<email address hidden>> wrote:

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/716/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-31: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:650
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/745/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4400/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3995/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/261/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/249/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/248/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4501/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4016/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/745/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-31: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/744/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-31: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/746/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-04-01: Posted in a previous version of this proposal

#

Thank you for your work, that looks mostly fine, 3 of the StorageTestCase tests fail if the xdg directories are missing though

e.g

"Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/ubuntu_system_settings/tests/test_about.py", line 161, in test_space_used_by_music
    music_space = self._get_space_by_directory('Music')
  File "/usr/lib/python2.7/dist-packages/ubuntu_system_settings/tests/test_about.py", line 131, in _get_space_by_directory
    output = subprocess.check_output(['du', '--block-size=1', location])
  File "/usr/lib/python2.7/subprocess.py", line 573, in check_output
    raise CalledProcessError(retcode, cmd, output=output)
CalledProcessError: Command '['du', '--block-size=1', '/home/user/Videos']' returned non-zero exit status 1

same for Pictures and Music

Those directories are translated if you use a different locale (e.g they are "Vidéos" "Images" "Musique" on a french system). You either need to restore the translations or handle the directories not being there

review: Needs Fixing

Revision history for this message

Omer Akram (om26er) wrote on 2014-04-01: Posted in a previous version of this proposal

#

Thanks for the review, I have fixed that problem, now we are translating those names.

Revision history for this message

Iain Lane (laney) wrote on 2014-04-01: Posted in a previous version of this proposal

#

Drive-by commenting...

On Tue, Apr 01, 2014 at 04:22:31PM -0000, Omer Akram wrote:
> Thanks for the review, I have fixed that problem, now we are translating those names.

You can do this more flexibly (since users are allowed to change these
directories to anything they want) by retrieving the actual user dir in
use.

For example using GLib with gi like so:

>>> from gi.repository import GLib
>>> GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
'/home/laney/Music'

It's not essential, but it'd be nice to do that this time round if you
can. This is the kind of enhancement that falls through the cracks.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-01: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/750/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-04-01: Posted in a previous version of this proposal

#

Thanks, the tests still can fail though (if you run under a C local on a non english desktop, or if the directories are missing), the proper solution is the one hinted by Laney. We should also handle without failing the case when one of the directory is missing on disk (which can happen)

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-01:

#

FAILED: Continuous integration, rev:654
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~om26er/ubuntu-system-settings/fix_tests/+merge/213691/+edit-commit-message

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/752/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-04-02:

#

> 222 + @skipUnless(
> 223 + model() == 'Nexus 4',
> 224 + 'Nexus 4 is currently the only telephony device that we support'
> 225 + )
> 226 + def test_imei_information_is_correct(self):

Is there a way we could make that more dynamic and check through ofono for the imei information being there, instead of coding a specific model in the test?

review: Needs Fixing

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-04-02:

#

same about the model() == 'Desktop' skips, can't we just check for the service/command to be there or not and handle the case where it's not?

Revision history for this message

Iain Lane (laney) wrote on 2014-04-02:

#

> Is there a way we could make that more dynamic and check through ofono for the
> imei information being there, instead of coding a specific model in the test?

It should display 'N/A' when no IMEI is available.

I see some tests that are skipped on desktop too - do you think we could test the corresponding desktop case as well?

Revision history for this message

Iain Lane (laney) wrote on 2014-04-02:

#

> I see some tests that are skipped on desktop too - do you think we could test
> the corresponding desktop case as well?

Like check if the data is available and if it's not that the correct 'not available' string is displayed in the UI, instead of having conditional skips.

lp:~om26er/ubuntu-system-settings/fix_tests updated on 2014-04-02

655. By Omer Akram on 2014-04-02: use glib to get directory locations inside HOME
656. By Omer Akram on 2014-04-02: make tests more solid by using Eventually
657. By Omer Akram on 2014-04-02: skip test if the directory does not exist
658. By Omer Akram on 2014-04-02: don't skip tests based on platform, rather handle cases in code

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-02:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/756/rebuild

review: Needs Fixing (continuous-integration)

lp:~om26er/ubuntu-system-settings/fix_tests updated on 2014-04-02

659. By Omer Akram on 2014-04-02: skip test if getprop is not found instead of making it platform dependent
660. By Omer Akram on 2014-04-02: fix pep8/pyflakes complaints

Revision history for this message

Omer Akram (om26er) wrote on 2014-04-02:

#

Thanks for the review. I have fixed everything suggested above.

Now getting directory locations from GLib and if a directory does not exist we skip the test gracefully.
Also not skipping tests based on what platforms they are run on rather checking if the required functionality is available to use, also enhances the tests a bit to tests the cases for Desktop scenario.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-02:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/758/rebuild

review: Needs Fixing (continuous-integration)

lp:~om26er/ubuntu-system-settings/fix_tests updated on 2014-04-02

661. By Omer Akram on 2014-04-02: merge with trunk, fix conflicts

Revision history for this message

Omer Akram (om26er) wrote on 2014-04-02:

#

Merged with trunk again and fixed conflicts.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-02:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/759/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-02:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/761/rebuild

review: Needs Fixing (continuous-integration)

lp:~om26er/ubuntu-system-settings/fix_tests updated on 2014-04-02

662. By Omer Akram on 2014-04-02: fix

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-02:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/763/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-04-03:

#

thanks

> 217 +
> 218 + if model() == 'Desktop':
> 219 + self.assertThat(item.visible, Equals(False))

that still special case "Desktop", which means those would fail on e.g a tablet, can't you just call self._get_device_serial_number() and test if the return is empty/null?

Looks fine out of those issues (same for serial and imei)

review: Needs Fixing

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-04-04:

#

oh, another issues, the checks for the space used by the movie/music/picture directories fail if the computation takes more than 10 seconds (they value are only displayed when all results are received, or the "space taken by Ubuntu" can easily take a minute on a desktop installation)

Not sure how to address those though, does anyone has a suggestion?

lp:~om26er/ubuntu-system-settings/fix_tests updated on 2014-04-08

663. By Omer Akram on 2014-04-08: don't skip tests based on platform, rather check if the required backend is availabe or not and test accordingly
664. By Omer Akram on 2014-04-08: skip disk storage tests on desktop as they can fail because the calculation can take a long time, bug 1304328

Revision history for this message

Omer Akram (om26er) wrote on 2014-04-08:

#

> thanks
>
> > 217 +
> > 218 + if model() == 'Desktop':
> > 219 + self.assertThat(item.visible, Equals(False))
>
> that still special case "Desktop", which means those would fail on e.g a
> tablet, can't you just call self._get_device_serial_number() and test if the
> return is empty/null?
>
> Looks fine out of those issues (same for serial and imei)

Fixed that now.

Revision history for this message

Omer Akram (om26er) wrote on 2014-04-08:

#

> oh, another issues, the checks for the space used by the movie/music/picture
> directories fail if the computation takes more than 10 seconds (they value are
> only displayed when all results are received, or the "space taken by Ubuntu"
> can easily take a minute on a desktop installation)
>
> Not sure how to address those though, does anyone has a suggestion?

As discussed on IRC, I have skipped those tests on the Desktop and reported bug 1304328 to track what needs to be changed in the system settings.

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-04-08:

#

> As discussed on IRC, I have skipped those tests on the Desktop

We didn't say "on the Desktop", as in previous comment I don't think we should special case Desktop. The factor there is how much datas you have and how slow the storage access is. Looking at an android tablet it's likely that the estimate are going to take longer than 10 seconds on devices as well... can we just skip those tests, and not only on desktop, as long as they are not reliable

review: Needs Fixing

lp:~om26er/ubuntu-system-settings/fix_tests updated on 2014-04-08

665. By Omer Akram on 2014-04-08: skip disk space tests, in some cases they can be slow

Revision history for this message

Omer Akram (om26er) wrote on 2014-04-08:

#

> > As discussed on IRC, I have skipped those tests on the Desktop
>
> We didn't say "on the Desktop", as in previous comment I don't think we should
> special case Desktop. The factor there is how much datas you have and how slow
> the storage access is. Looking at an android tablet it's likely that the
> estimate are going to take longer than 10 seconds on devices as well... can we
> just skip those tests, and not only on desktop, as long as they are not
> reliable

Now they are skipped.

Given the amount of disk space on touch devices (max 64GB currently) and only a limited part of them allocated for the system partition i.e. where Ubuntu is installed, I believe this would not have caused trouble for us, at least if we gave the calculations a few retries just to be sure. Though I do agree that on the desktop we never be sure.

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-04-08:

#

> Now they are skipped.

thanks!

> i.e. where Ubuntu is installed, I believe this would not have caused trouble for us, at least if we gave the calculations a few retries just to be sure

well
- even on small disk it's easy to go over 10 seconds (I've seen android devices taking over 30 seconds on devices with 16GB of disk)
- having to retry sometime is a no go, we don't want flacky tests
- we need to design the tests to be robust on any device, not just to work on a new install in the QA test config

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/776/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/779/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-04-11:

#

Thanks

review: Approve

ubuntu-system-settings

Merge lp:~om26er/ubuntu-system-settings/fix_tests into lp:ubuntu-system-settings

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'plugins/about/License.qml'
 --- plugins/about/License.qml	2014-03-04 12:45:06 +0000
 +++ plugins/about/License.qml	2014-04-08 12:01:45 +0000
@@ -8,7 +8,6 @@
      property string binary;
      id: licensesPage
--    objectName: "licensesPage"
      title: binary
      flickable: scrollWidget
 === modified file 'plugins/about/Software.qml'
 --- plugins/about/Software.qml	2013-07-29 14:08:10 +0000
 +++ plugins/about/Software.qml	2014-04-08 12:01:45 +0000
@@ -7,6 +7,7 @@
  ItemPage {
      id: licensesPage
++    objectName: "licensesPage"
      title: i18n.tr("Software licenses")
      flickable: softwareList
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
 --- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-03-31 15:42:50 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-04-08 12:01:45 +0000
@@ -9,7 +9,6 @@
  from __future__ import absolute_import
--from ubuntu_system_settings.utils.i18n import ugettext as _
  from ubuntu_system_settings import helpers
  from autopilot.input import Mouse, Touch, Pointer
@@ -163,6 +162,7 @@
      def setUp(self):
          """ Go to About page """
          super(AboutBaseTestCase, self).setUp('about')
++        self.assertThat(self.about_page.active, Eventually(Equals(True)))
      @property
      def about_page(self):
@@ -177,10 +177,13 @@
          """ Go to Storage Page """
          super(StorageBaseTestCase, self).setUp()
          # Click on 'Storage' option
--        button = self.about_page.select_single(objectName='storageItem')
--        self.assertThat(button, NotEquals(None))
++        button = self.about_page.select_single(
++            'Standard', objectName='storageItem'
++        )
          self.scroll_to_and_click(button)
++        self.assertThat(self.storage_page.active, Eventually(Equals(True)))
++
      def assert_space_item(self, object_name, text):
          """ Checks whether an space item exists and returns a value """
          item = self.storage_page.select_single(objectName=object_name)
@@ -193,10 +196,17 @@
          values = size_label.text.split(' ')  # Format: "00.0 (bytes|MB|GB)"
          self.assertThat(len(values), GreaterThan(1))
++    def get_storage_space_used_by_category(self, objectName):
++        return self.main_view.wait_select_single(
++            'StorageItem', objectName=objectName
++            ).value
++
      @property
      def storage_page(self):
          """ Return 'Storage' page """
--        return self.main_view.select_single(objectName='storagePage')
++        return self.main_view.select_single(
++            'Storage', objectName='storagePage'
++        )
  class LicenseBaseTestCase(AboutBaseTestCase):
@@ -206,15 +216,17 @@
          """ Go to License Page """
          super(LicenseBaseTestCase, self).setUp()
          # Click on 'Software licenses' option
--        button = self.main_view.select_single(objectName='licenseItem')
--        self.assertThat(button, NotEquals(None))
--        self.assertThat(button.text, Equals(_('Software licenses')))
++        button = self.main_view.select_single(
++            'Standard', objectName='licenseItem'
++        )
          self.scroll_to_and_click(button)
      @property
      def licenses_page(self):
          """ Return 'License' page """
--        return self.main_view.select_single(objectName='licensesPage')
++        return self.main_view.wait_select_single(
++            'ItemPage', objectName='licensesPage'
++        )
  class SystemUpdatesBaseTestCase(UbuntuSystemSettingsTestCase):
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-04-02 09:06:34 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-04-08 12:01:45 +0000
@@ -5,11 +5,15 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
--from time import sleep
--
--from autopilot.platform import model
--from testtools.matchers import Equals, NotEquals, GreaterThan
--from unittest import expectedFailure
++import os
++import subprocess
++import unittest
++
++from gi.repository import GLib
++
++from autopilot.matchers import Eventually
++from testtools import skipIf
++from testtools.matchers import Equals, NotEquals
  from ubuntu_system_settings.tests import (
      AboutBaseTestCase,
@@ -18,97 +22,148 @@
+ )
  from ubuntu_system_settings.utils.i18n import ugettext as _
++import dbus
++
  class AboutTestCase(AboutBaseTestCase):
      """ Tests for About this phone Page """
--    def test_about_page(self):
--        """ Checks whether About page is available """
--        self.assertThat(self.about_page, NotEquals(None))
--        self.assertThat(self.about_page.title, Equals(_('About this phone')))
--
--    def test_device(self):
--        """ Checks whether Device info is shown """
--        device_label = self.about_page.select_single(objectName='deviceLabel')
--        self.assertThat(device_label, NotEquals(None))
--        self.assertThat(device_label.text, NotEquals(''))
++    def _get_imei_from_dbus(self):
++        bus = dbus.SystemBus()
++        try:
++            manager = dbus.Interface(
++                bus.get_object('org.ofono', '/'), 'org.ofono.Manager'
++            )
++        except dbus.exceptions.DBusException:
++            # oFono interface not found, probably its a desktop.
++            return None
++
++        modems = manager.GetModems()
++        for path, properties in modems:
++            return properties['Serial']
++
++    def _get_os_name(self):
++        os_id = subprocess.check_output(['lsb_release', '-is'])
++        os_release = subprocess.check_output(['lsb_release', '-rs'])
++
++        return '{} {}'.format(os_id.strip(), os_release.strip())
++
++    def _get_device_serial_number(self):
++        try:
++            return subprocess.check_output(['getprop', 'ro.serialno']).strip()
++        except OSError:
++            # getprop is only available on android hardware.
++            return None
++
++    def _get_device_manufacturer_and_model(self):
++        manufacturer = subprocess.check_output(
++            ['getprop', 'ro.product.manufacturer']
++            ).strip()
++        hw_model = subprocess.check_output(
++            ['getprop', 'ro.product.model']
++            ).strip()
++
++        return '{} {}'.format(manufacturer, hw_model)
++
++    def _get_system_image_iface(self):
++        bus = dbus.SystemBus()
++        service = bus.get_object('com.canonical.SystemImage', '/Service')
++        iface = dbus.Interface(service, 'com.canonical.SystemImage')
++        return iface.Info()
++
++    def _get_last_updated_date(self):
++        info = self._get_system_image_iface()[3]
++
++        if info == 'Unknown':
++            return _('Never')
++        else:
++            return str(info.split()[0])
      def test_serial(self):
--        """ Checks whether Serial info is available """
++        """Checks whether the UI is showing the correct serial number."""
          item = self.about_page.select_single(objectName='serialItem')
--        if (model() == 'Desktop'):
--            self.assertThat(item.visible, Equals(False))
--        else:
--            self.assertThat(item.visible, Equals(True))
--            self.assertThat(item.text, Equals(_('Serial')))
--            self.assertThat(item.value, NotEquals(_('N/A')))
--
--    def test_imei(self):
--        """ Checks whether IMEI info is available """
--        item = self.about_page.select_single(objectName='imeiItem')
--        if (model() == 'Desktop'):
--            self.assertThat(item.visible, Equals(False))
--        else:
--            self.assertThat(item.visible, Equals(True))
--            self.assertThat(item.text, Equals(_('IMEI')))
--            self.assertThat(item.value, NotEquals(_('N/A')))
--
--    def test_software(self):
--        """ Checks whether Software info is available """
--        item = self.about_page.select_single(objectName='softwareItem')
--        self.assertThat(item, NotEquals(None))
--        self.assertThat(item.text, Equals(_('Software:')))
--
--    def test_os(self):
--        """ Checks whether OS info is available """
++        serial = self._get_device_serial_number()
++
++        if not serial:
++            self.assertThat(item.visible, Equals(False))
++        else:
++            self.assertThat(
++                item.value, Equals(self._get_device_serial_number())
++            )
++
++    def test_imei_information_is_correct(self):
++        """Checks whether the UI is exposing the right IMEI."""
++        imei_item = self.about_page.wait_select_single(
++            objectName='imeiItem')
++        imei_ofono = self._get_imei_from_dbus()
++
++        if not imei_ofono:
++            self.assertThat(imei_item.visible, Equals(False))
++        else:
++            self.assertEquals(imei_item.value, imei_ofono)
++
++    def test_settings_show_correct_version_of_the_os(self):
++        """Ensure the UI is showing the correct version of the OS."""
          item = self.about_page.select_single(objectName='osItem')
--        self.assertThat(item, NotEquals(None))
--        self.assertThat(item.text, Equals(_('OS')))
--        info = item.value.split()
--        self.assertThat(len(info), GreaterThan(1))
--        self.assertThat(info[0], Equals(_('Ubuntu')))
--        self.assertThat(info[1], NotEquals(''))
--        if (len(info) > 2):
--            self.assertThat(info[2], NotEquals(''))
++        # TODO: find a way to check the image build number as well
++        # -- om26er 10-03-2014
++        self.assertTrue(self._get_os_name() in item.value)
++
++    @skipIf(subprocess.call(
++        ['which', 'getprop'], stdout=subprocess.PIPE) != 0,
++        'program "getprop" not found'
++    )
++    def test_hardware_name(self):
++        """Ensure the UI is showing the correct device name."""
++        device_label = self.about_page.select_single(
++            objectName='deviceLabel'
++            ).text
++        device_name_from_getprop = self._get_device_manufacturer_and_model()
++
++        self.assertEquals(device_label, device_name_from_getprop)
      def test_last_updated(self):
--        """ Checks whether Last Updated info is available """
--        item = self.about_page.select_single(objectName='lastUpdatedItem')
--        self.assertThat(item, NotEquals(None))
--        self.assertThat(item.text, Equals(_('Last updated')))
--        date = item.value.split('-')
--        if (len(date) == 1):
--            self.assertThat(item.value, Equals(_('Never')))
--        else:
--            # 2013-10-19
--            self.assertThat(len(item.value), Equals(10))
--
--    def test_legal(self):
--        """ Checks whether Legal info is available """
--        item = self.about_page.select_single(objectName='legalItem')
--        self.assertThat(item, NotEquals(None))
--        self.assertThat(item.text, Equals(_('Legal:')))
--
--    def test_update(self):
--        """ Checks whether Update button is available """
--        button = self.about_page.select_single(objectName='updateButton')
--        self.assertThat(button, NotEquals(None))
--        self.assertThat(button.text, Equals(_('Check for updates')))
++        """Checks whether Last Updated info is correct."""
++        last_updated = self.about_page.select_single(
++            objectName='lastUpdatedItem'
++            ).value
++
++        self.assertEquals(last_updated, self._get_last_updated_date())
  class StorageTestCase(StorageBaseTestCase):
      """ Tests for Storage """
--    def test_storage_page(self):
--        """ Check whether Storage page is available """
--        self.assertThat(self.storage_page, NotEquals(None))
++    def _get_space_by_directory(self, dir_name):
++        if dir_name == 'Music':
++            location = GLib.get_user_special_dir(
++                GLib.UserDirectory.DIRECTORY_MUSIC
++            )
++        elif dir_name == 'Videos':
++            location = GLib.get_user_special_dir(
++                GLib.UserDirectory.DIRECTORY_VIDEOS
++            )
++        elif dir_name == 'Pictures':
++            location = GLib.get_user_special_dir(
++                GLib.UserDirectory.DIRECTORY_PICTURES
++            )
++        else:
++            raise ValueError(
++                '{} directory not handled by this fuction, you need to enhance'
++                ' this function to handle that directory.'.format(dir_name)
++            )
++
++        if not os.path.exists(location):
++            self.skipTest('glib directory {} does not exist'.format(dir_name))
++
++        output = subprocess.check_output(['du', '--block-size=1', location])
++        disk_space = output.split()[len(output.split()) - 2]
++        return disk_space
      def test_disk(self):
          """ Checks whether disk item is available """
--        sleep(5)
--        disk_item = self.storage_page.select_single(objectName='diskItem')
--        self.assertThat(disk_item, NotEquals(None))
--        self.assertThat(disk_item.text, Equals(_('Total storage')))
++        disk_item = self.storage_page.wait_select_single(objectName='diskItem')
++        self.assertThat(disk_item.text, Equals('Total storage'))
      def test_space(self):
          """ Checks whether storage item is available """
@@ -118,17 +173,49 @@
          """ Checks storage item """
          self.assert_space_item('usedByUbuntuItem', _('Used by Ubuntu'))
--    def test_space_movies(self):
--        """ Checks whether space item is available """
--        self.assert_space_item('moviesItem', _('Videos'))
--
--    def test_space_audio(self):
--        """ Checks whether space item is available """
--        self.assert_space_item('audioItem', _('Audio'))
--
--    def test_space_pictures(self):
--        """ Checks whether space item is available """
--        self.assert_space_item('picturesItem', _('Pictures'))
++    @unittest.skip(
++        'Disk calculation can take a while depending on different factors '
++        'we dont want to wait for it to calculate.'
++    )
++    def test_space_used_by_movies(self):
++        """ Checks whether space shown to be used by movies is
++        correct. """
++        movie_space = self._get_space_by_directory('Videos')
++        movie_space_in_ui = self.get_storage_space_used_by_category(
++            'moviesItem'
++        )
++
++        self.assertThat(movie_space_in_ui, Eventually(Equals(movie_space)))
++
++    @unittest.skip(
++        'Disk calculation can take a while depending on different factors '
++        'we dont want to wait for it to calculate.'
++    )
++    def test_space_used_by_music(self):
++        """ Checks whether space shown to be used by music is
++        correct. """
++        music_space = self._get_space_by_directory('Music')
++        music_space_in_ui = self.get_storage_space_used_by_category(
++            'audioItem'
++        )
++
++        self.assertThat(music_space_in_ui, Eventually(Equals(music_space)))
++
++    @unittest.skip(
++        'Disk calculation can take a while depending on different factors '
++        'we dont want to wait for it to calculate.'
++    )
++    def test_space_used_by_pictures(self):
++        """ Checks whether space shown to be used by pictures is
++        correct. """
++        pictures_space = self._get_space_by_directory('Pictures')
++        pictures_space_in_ui = self.get_storage_space_used_by_category(
++            'picturesItem'
++        )
++
++        self.assertThat(
++            pictures_space_in_ui, Eventually(Equals(pictures_space))
++        )
      def test_space_other_files(self):
          """ Checks whether space item is available """
@@ -149,7 +236,6 @@
  class LicenseTestCase(LicenseBaseTestCase):
      """ Tests for Licenses """
--    @expectedFailure
      def test_licenses_page(self):
          """ Check whether Storage page is available """
--        self.assertThat(self.licenses_page, NotEquals(None))
++        self.assertThat(self.licenses_page.active, Eventually(Equals(True)))
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_search.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_search.py	2014-03-10 11:24:08 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_search.py	2014-04-08 12:01:45 +0000
@@ -6,7 +6,8 @@
  # by the Free Software Foundation.
  from autopilot.introspection.dbus import StateNotFoundError
--from testtools.matchers import Equals, NotEquals
++from testtools.matchers import Equals
++from autopilot.matchers import Eventually
  from ubuntu_system_settings.tests import UbuntuSystemSettingsTestCase
  from ubuntu_system_settings.utils.i18n import ugettext as _
@@ -21,22 +22,25 @@
      def setUp(self):
          super(SearchTestCases, self).setUp()
--    def test_search(self):
++    def _get_entry_component(self, name):
++        return self.main_view.wait_select_single(
++            objectName='entryComponent-' + name
++        )
++
++    def _type_into_search_box(self, text):
++        search_box = self.main_view.select_single(
++            objectName='searchTextField'
++        )
++        self.scroll_to_and_click(search_box)
++        self.keyboard.type(_(text))
++        self.assertThat(search_box.text, Eventually(Equals(text)))
++
++    def test_search_filter_results(self):
          """ Checks whether Search box actually filters the results """
--        # Select search text field
--        search = self.main_view.select_single(objectName='searchTextField')
--        self.assertThat(search, NotEquals(None))
--        # Move to text field
--        self.scroll_to_and_click(search)
--        # Filter by string
--        self.keyboard.type(_('Sound'))
--        # Search component
--        sound = self.main_view.select_single(objectName='entryComponent-sound')
--        self.assertThat(sound, NotEquals(None))
--        try:
--            background = self.main_view.select_single(
--                objectName='entryComponent-background'
--            )
--        except StateNotFoundError:
--            background = None
--        self.assertThat(background, Equals(None))
++        self._type_into_search_box('Sound')
++        sound_icon = self._get_entry_component('sound')
++
++        self.assertThat(sound_icon.visible, Eventually(Equals(True)))
++        self.assertRaises(
++            StateNotFoundError, self._get_entry_component, 'background'
++        )