ubuntu-system-settings

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

fix_tests
Merge into trunk

Proposed by Omer Akram on 2014-03-09

Status:

Superseded

Proposed branch:

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

Merge into:

lp:ubuntu-system-settings

Prerequisite:

lp:~om26er/ubuntu-system-settings/pep8_pyflakes_fix

Diff against target:

527 lines (+235/-135)

6 files modified

plugins/about/License.qml (+0/-1)
plugins/about/Software.qml (+1/-0)
tests/autopilot/ubuntu_system_settings/helpers.py (+54/-0)
tests/autopilot/ubuntu_system_settings/tests/__init__.py (+23/-25)
tests/autopilot/ubuntu_system_settings/tests/test_about.py (+134/-90)
tests/autopilot/ubuntu_system_settings/tests/test_search.py (+23/-19)

To merge this branch:

bzr merge lp:~om26er/ubuntu-system-settings/fix_tests

Undecided

Fix Released

Link a bug report

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

This proposal has been superseded by a proposal from 2014-04-01.

Commit message

autopilot tests improvements:
* Improved existing tests to compare values with backends instead of just testing the 'item' is there.
* Fixed a skipped failing test
* Delete label tests and those which are trying to make sure certain elements exist.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10:

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

review: Needs Fixing (continuous-integration)

lp:~om26er/ubuntu-system-settings/fix_tests updated on 2014-03-10

648. By Omer Akram on 2014-03-10: fix pep8
649. By Omer Akram on 2014-03-10: fix

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10:

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:

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:

\o/

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

lp:~om26er/ubuntu-system-settings/fix_tests updated on 2014-03-18

650. By Omer Akram on 2014-03-18: merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

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:

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:

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

review: Needs Fixing (continuous-integration)

lp:~om26er/ubuntu-system-settings/fix_tests updated on 2014-03-31

651. By Omer Akram on 2014-03-31: bring back system updates changes so we don't conflict
652. By Omer Akram on 2014-03-31: merge trunk, fix conflicts

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-31:

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:

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

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

653. By Omer Akram on 2014-04-01: translate directory names so that tests don't fail on non-english desktops

Revision history for this message

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

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:

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> ]

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

654. By Omer Akram on 2014-04-01: merge with victor's branch, fix conflicts

Revision history for this message

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

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:

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

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

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
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
661. By Omer Akram on 2014-04-02: merge with trunk, fix conflicts
662. By Omer Akram on 2014-04-02: fix
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
665. By Omer Akram on 2014-04-08: skip disk space tests, in some cases they can be slow

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Omer Akram

Ubuntu Touch System Settings

 === modified file 'plugins/about/License.qml'
 --- plugins/about/License.qml	2014-03-04 12:45:06 +0000
 +++ plugins/about/License.qml	2014-04-01 16:56:38 +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-01 16:56:38 +0000
@@ -7,6 +7,7 @@
  ItemPage {
      id: licensesPage
++    objectName: "licensesPage"
      title: i18n.tr("Software licenses")
      flickable: softwareList
 === added file 'tests/autopilot/ubuntu_system_settings/helpers.py'
 --- tests/autopilot/ubuntu_system_settings/helpers.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/ubuntu_system_settings/helpers.py	2014-04-01 16:56:38 +0000
@@ -0,0 +1,54 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++#
++# Copyright (C) 2014 Canonical Ltd.
++#
++# 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/>.
++
++APP_PATH = '/usr/bin/system-settings'
++DESKTOP_FILE = '/usr/share/applications/ubuntu-system-settings.desktop'
++
++from autopilot import platform
++
++from ubuntuuitoolkit import emulators as toolkit_emulators
++
++
++def launch_system_settings(testobj, panel=None):
++    """Launch system settings application
++
++    :param testobj: An AutopilotTestCase object, needed to call
++    testobj.launch_test_application()
++
++    :param panel: Launch to a specific panel. Default None.
++
++    :param emulator_base: emulator_base for launch_test_application.
++
++    :returns: A proxy object that represents the application. Introspection
++    data is retrievable via this object.
++    """
++    params = [APP_PATH]
++    if platform.model() != 'Desktop':
++        params.append('--desktop_file_hint={}'.format(DESKTOP_FILE))
++
++    # Launch to a specific panel
++    if panel is not None:
++        params.append(panel)
++
++    # Default emulator base
++    emulator = toolkit_emulators.UbuntuUIToolkitEmulatorBase
++
++    app = testobj.launch_test_application(
++        *params,
++        app_type='qt',
++        emulator_base=emulator)
++
++    return app
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
 --- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-03-27 13:16:09 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-04-01 16:56:38 +0000
@@ -9,7 +9,7 @@
  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
  from autopilot.platform import model
@@ -34,24 +34,9 @@
      def setUp(self, panel=None):
          super(UbuntuSystemSettingsTestCase, self).setUp()
--        self.launch_system_settings(panel=panel)
++        self.app = helpers.launch_system_settings(self, panel=panel)
          self.assertThat(self.main_view.visible, Eventually(Equals(True)))
--    def launch_system_settings(self, panel=None):
--        params = ['/usr/bin/system-settings']
--        if (model() != 'Desktop'):
--            params.append('--desktop_file_hint=/usr/share/applications/'
--                          'ubuntu-system-settings.desktop')
--
--        # Launch to a specific panel
--        if panel is not None:
--            params.append(panel)
--
--        self.app = self.launch_test_application(
--            *params,
--            app_type='qt',
--            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
--
      @property
      def main_view(self):
          """ Return main view """
@@ -107,7 +92,7 @@
      def setUp(self):
          super(UbuntuSystemSettingsBatteryTestCase, self).setUp()
          self.add_mock_battery()
--        self.launch_system_settings()
++        self.app = helpers.launch_system_settings(self)
          self.assertThat(self.main_view.visible, Eventually(Equals(True)))
@@ -177,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):
@@ -191,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)
@@ -207,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):
@@ -220,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-03-10 11:24:08 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-04-01 16:56:38 +0000
@@ -5,11 +5,13 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
--from time import sleep
++import os
++import subprocess
++from autopilot.matchers import Eventually
  from autopilot.platform import model
--from testtools.matchers import Equals, NotEquals, GreaterThan
--from unittest import expectedFailure
++from testtools import skipUnless, skipIf
++from testtools.matchers import Equals, NotEquals
  from ubuntu_system_settings.tests import (
      AboutBaseTestCase,
@@ -18,97 +20,122 @@
+ )
  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()
++        manager = dbus.Interface(
++            bus.get_object('org.ofono', '/'), 'org.ofono.Manager'
++        )
++        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):
++        return subprocess.check_output(['getprop', 'ro.serialno']).strip()
++
++    def _get_device_manufacturer_and_model(self):
++        manufacturer = subprocess.check_output(
++            ['getprop', 'ro.product.manufacturer']
++            ).strip()
++        model = subprocess.check_output(
++            ['getprop', 'ro.product.model']
++            ).strip()
++
++        return '{} {}'.format(manufacturer, 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')
--        self.assertThat(item, NotEquals(None))
--        self.assertThat(item.text, Equals(_('Serial')))
--        if (model() == 'Desktop'):
--            self.assertThat(item.value, Equals(_('N/A')))
--        else:
--            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')
--        self.assertThat(item, NotEquals(None))
--        self.assertThat(item.text, Equals(_('IMEI')))
--        if (model() == 'Desktop'):
--            self.assertThat(item.value, Equals(_('N/A')))
--        else:
--            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 """
++
++        if model() == 'Desktop':
++            self.assertThat(item.value, Equals(_('N/A')))
++        else:
++            self.assertThat(
++                item.value, Equals(self._get_device_serial_number())
++            )
++
++    @skipUnless(
++        model() == 'Nexus 4',
++        'Nexus 4 is currently the only telephony device that we support'
++    )
++    def test_imei_information_is_correct(self):
++        """Checks whether the UI is exposing the right IMEI."""
++        imei = self.about_page.wait_select_single(
++            objectName='imeiItem').value
++
++        self.assertEquals(imei, self._get_imei_from_dbus())
++
++    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(
++        model() == 'Desktop',
++        'Only run on android devices where getprop is available')
++    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)
++
++    @skipIf(
++        model() == 'Desktop',
++        'Image based upgrades are only available on touch devices, for now.'
++    )
      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):
++        location = os.path.expanduser('~/' + 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 +145,35 @@
          """ 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'))
++    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.assertEquals(movie_space_in_ui, movie_space)
++
++    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.assertEquals(music_space_in_ui, music_space)
++
++    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.assertEquals(pictures_space_in_ui, pictures_space)
      def test_space_other_files(self):
          """ Checks whether space item is available """
@@ -149,7 +194,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-01 16:56:38 +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'
++        )

ubuntu-system-settings

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

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers