Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/initSortOrder2 into lp:ubuntu-ui-toolkit/staging

  1. initSortOrder2
  2. Merge into staging
Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 1095
Merged at revision: 1097
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/initSortOrder2
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 63 lines (+20/-0)
4 files modified
modules/Ubuntu/Components/plugin/filterbehavior.cpp (+8/-0)
modules/Ubuntu/Components/plugin/filterbehavior.h (+2/-0)
modules/Ubuntu/Components/plugin/sortbehavior.cpp (+8/-0)
modules/Ubuntu/Components/plugin/sortbehavior.h (+2/-0)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/initSortOrder2
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tim Peeters Approve
Review via email: mp+222072@code.launchpad.net

Commit message

Initialize sort.order explicitly

To post a comment you must log in.
Revision history for this message
Tim Peeters (tpeeters) wrote :

Perhaps it is better to do the initialization in the constructor of SortBehavior?

Do we need something similar for FilterBehavior?

Revision history for this message
Tim Peeters (tpeeters) wrote :

looks good, thanks.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1094
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/336/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/665
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/607
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/168
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/168
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1272
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1272/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8081
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/746/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

CI failed because of https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1326072
we need to wait for the fix to merge

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/154/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/669
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/98
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/98/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/98
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1278
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1278/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/750
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/750/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1095
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/339/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/675
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/171
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/171/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/171
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1286
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8095
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/550
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/757
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/757/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

_StringException: Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/ubuntuuitoolkit/tests/test_fixture_setup.py", line 301, in test_fake_home_fixture_must_copy_xauthority
    open(os.path.join(os.environ.get('HOME'), '.Xauthority')).close()
IOError: [Errno 2] No such file or directory: '/home/phablet/autopilot/fakeenv/tmpc5lOnd/.Xauthority'

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/157/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/685
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/627/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/101
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1299
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1299/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8110
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/558/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/766
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/766/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/plugin/filterbehavior.cpp'
2--- modules/Ubuntu/Components/plugin/filterbehavior.cpp 2014-05-15 09:35:22 +0000
3+++ modules/Ubuntu/Components/plugin/filterbehavior.cpp 2014-06-04 17:00:17 +0000
4@@ -19,6 +19,14 @@
5
6 #include "filterbehavior.h"
7
8+FilterBehavior::FilterBehavior(QObject *parent)
9+ : QObject(parent)
10+ , m_property(QString())
11+ , m_pattern(QRegExp())
12+{
13+
14+}
15+
16 QString
17 FilterBehavior::property() const
18 {
19
20=== modified file 'modules/Ubuntu/Components/plugin/filterbehavior.h'
21--- modules/Ubuntu/Components/plugin/filterbehavior.h 2014-05-15 09:35:22 +0000
22+++ modules/Ubuntu/Components/plugin/filterbehavior.h 2014-06-04 17:00:17 +0000
23@@ -29,6 +29,8 @@
24 Q_PROPERTY(QRegExp pattern READ pattern WRITE setPattern NOTIFY patternChanged)
25
26 public:
27+ explicit FilterBehavior(QObject *parent = 0);
28+
29 QString property() const;
30 void setProperty(const QString& property);
31 QRegExp pattern() const;
32
33=== modified file 'modules/Ubuntu/Components/plugin/sortbehavior.cpp'
34--- modules/Ubuntu/Components/plugin/sortbehavior.cpp 2014-05-15 09:35:22 +0000
35+++ modules/Ubuntu/Components/plugin/sortbehavior.cpp 2014-06-04 17:00:17 +0000
36@@ -19,6 +19,14 @@
37
38 #include "sortbehavior.h"
39
40+SortBehavior::SortBehavior(QObject *parent)
41+ : QObject(parent)
42+ , m_property(QString())
43+ , m_order(Qt::AscendingOrder)
44+{
45+
46+}
47+
48 QString
49 SortBehavior::property() const
50 {
51
52=== modified file 'modules/Ubuntu/Components/plugin/sortbehavior.h'
53--- modules/Ubuntu/Components/plugin/sortbehavior.h 2014-05-15 09:35:22 +0000
54+++ modules/Ubuntu/Components/plugin/sortbehavior.h 2014-06-04 17:00:17 +0000
55@@ -29,6 +29,8 @@
56 Q_PROPERTY(Qt::SortOrder order READ order WRITE setOrder NOTIFY orderChanged)
57
58 public:
59+ explicit SortBehavior(QObject *parent = 0);
60+
61 QString property() const;
62 void setProperty(const QString& property);
63 Qt::SortOrder order() const;

Subscribers

People subscribed via source and target branches