Merge into staging : grid_units : Code : Ubuntu UI Toolkit

Status:	Merged
Approved by:	Tim Peeters on 2015-04-13
Approved revision:	1424
Merged at revision:	1473
Proposed branch:	lp:~canonical-platform-qa/ubuntu-ui-toolkit/grid_units
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	108 lines (+99/-0) 2 files modified tests/autopilot/ubuntuuitoolkit/tests/components/test_units.py (+61/-0) tests/autopilot/ubuntuuitoolkit/units.py (+38/-0)
To merge this branch:	bzr merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/grid_units
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-04-13
Tim Peeters			Approve on 2015-04-13
Leo Arias (community)			Approve on 2015-04-13
Zsombor Egri (community)		2015-02-06	Needs Fixing on 2015-02-09
Review via email: mp+248980@code.launchpad.net

PS Jenkins bot (ps-jenkins) wrote on 2015-02-07:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1420/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-07:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1421/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-07:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1423/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-07:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1424/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-09:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1425/rebuild

review: Needs Fixing (continuous-integration)

Zsombor Egri (zsombi) wrote on 2015-02-09:

#

Small comment underneath

review: Needs Fixing

Tim Peeters (tpeeters) wrote on 2015-02-09:

#

The tests don't use features of the MainView, so you could instead use a simple Item as the root.

PS Jenkins bot (ps-jenkins) wrote on 2015-02-09:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1426/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-13:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1443/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-13:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1444/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-16:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1446/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-19:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1459/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-19:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1462/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-23:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1467/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-23:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1469/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-25:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1479/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-03-06:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1528/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-03-06:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1531/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-03-16:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1555/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-04-10:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1653/rebuild

review: Needs Fixing (continuous-integration)

Brendan Donegan (brendan-donegan) wrote on 2015-04-13:

#

Just a note that I doubt an autopilot test is the best way to test these new functions - a python unit test seems more appropriate - after all we only care that those functions return the correct values, everything else is incidental.

Leo Arias (elopio) wrote on 2015-04-13:

#

I thought about that too, but having these tests failing on mako shows it might not be a good idea.
I can easily write a test that checks that the returned values are right, but we are missing something that makes the high level tests fail. We need to first find what the issue is on the high level test, and write a low level test for it.

Leo Arias (elopio) wrote on 2015-04-13:

#

Ran the tests, looks good. Thanks for the digging into this.

review: Approve

Tim Peeters (tpeeters) wrote on 2015-04-13:

#

Looks good!

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-04-13:

#

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/884/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/192/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/191/console

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-04-13:

#

FAILED: Continuous integration, rev:1423
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1656/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2200/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/383/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/386/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/383/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2198/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1656/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/grid_units updated on 2015-04-13

1424. By Brendan Donegan on 2015-04-13: Fix flake8 issues

PS Jenkins bot (ps-jenkins) on 2015-04-13:

#

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-04-13:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1658/rebuild

review: Needs Fixing (continuous-integration)

 === added file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_units.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/components/test_units.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/components/test_units.py	2015-04-13 18:20:25 +0000
@@ -0,0 +1,61 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++#
++# Copyright (C) 2015 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/>.
++
++"""Tests for the Ubuntu UI Toolkit units helpers."""
++
++import logging
++import os
++import testscenarios
++import testtools
++
++import fixtures
++
++from ubuntuuitoolkit import (
++    fixture_setup,
++    units
++)
++
++
++logger = logging.getLogger(__name__)
++
++
++class UnitsTestCase(testscenarios.TestWithScenarios,
++                    testtools.TestCase):
++
++    WIDTH_IN_GU = 20
++
++    path = os.path.abspath(__file__)
++    dir_path = os.path.dirname(path)
++    test_qml_file_path = os.path.join(
++        dir_path, 'test_units.UnitsTestCase.qml')
++
++    scenarios = [
++        ('with default GRID_UNIT_PX', {'grid_unit_px': '',
++         'expected_pixels': 160}),
++        ('with GRID_UNIT_PX environment variable set', {'grid_unit_px': '10',
++         'expected_pixels': 200})
++    ]
++
++    def setUp(self):
++        self.useFixture(fixtures.EnvironmentVariable(
++            'GRID_UNIT_PX', self.grid_unit_px))
++        self.useFixture(fixture_setup.InitctlEnvironmentVariable(
++            global_=True, GRID_UNIT_PX=self.grid_unit_px))
++        super(UnitsTestCase, self).setUp()
++
++    def test_gu(self):
++        pixels = units.gu(self.WIDTH_IN_GU)
++        self.assertEquals(pixels, self.expected_pixels)
 === added file 'tests/autopilot/ubuntuuitoolkit/units.py'
 --- tests/autopilot/ubuntuuitoolkit/units.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/ubuntuuitoolkit/units.py	2015-04-13 18:20:25 +0000
@@ -0,0 +1,38 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++#
++# Copyright (C) 2015 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/>.
++
++"""Ubuntu UI Toolkit units helpers."""
++
++import os
++
++from ubuntuuitoolkit import environment
++
++
++ENV_GRID_UNIT_PX = 'GRID_UNIT_PX'
++DEFAULT_GRID_UNIT_PX = 8
++
++
++def get_grid_unit():
++    grid_unit_px = os.environ.get(ENV_GRID_UNIT_PX, None)
++    if not grid_unit_px and environment.is_initctl_env_var_set(
++            ENV_GRID_UNIT_PX):
++        grid_unit_px = environment.get_initctl_env_var(ENV_GRID_UNIT_PX)
++    return float(grid_unit_px or DEFAULT_GRID_UNIT_PX)
++
++
++def gu(value):
++    """"Return the number of pixels corresponding to value in grid units."""
++    return value * get_grid_unit()

Ubuntu UI Toolkit

Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/grid_units into lp:ubuntu-ui-toolkit/staging

Commit Message

Description of the Change

Preview Diff

Subscribers