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

Proposed by Cris Dywan
Status: Merged
Merged at revision: 1154
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/apiStdErr
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 43 lines (+5/-7)
1 file modified
tests/qmlapicheck.py (+5/-7)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/apiStdErr
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Tim Peeters Approve
Review via email: mp+227020@code.launchpad.net

Commit message

Print errors and help to sys.stderr

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

works, thanks

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

(proof that it works):

tim@C720:~/dev/ubuntu-ui-toolkit/m/140-headerSections$ bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/apiStdErr
 M tests/qmlapicheck.py
All changes applied successfully.
tim@C720:~/dev/ubuntu-ui-toolkit/m/140-headerSections$ ./tests/qmlapicheck.sh
Dumping QML API of C++ components
WARNING: default alarm manager not installed, using "memory" manager.
This manager may not provide all the needed features.
Running QML API check for modules/Ubuntu/Components/qmldir modules/Ubuntu/Layouts/qmldir modules/Ubuntu/PerformanceMetrics/qmldir modules/Ubuntu/Test/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/ListItems/qmldir modules/Ubuntu/Components/Pickers/qmldir modules/Ubuntu/Components/Popups/qmldir modules/Ubuntu/Components/Styles/qmldir modules/Ubuntu/Components/Themes/qmldir modules/Ubuntu/Components/Pickers/PickerPanel.qml
    readonly property alias sections
Error: Missing \qmlproperty for sections
Error: qmlapicheck.py failed

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

./tests/qmlapicheck.py:45:13: invalid syntax
        file=sys.stderr)

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

good, thanks

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

FAILED: Continuous integration, rev:1146
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/622/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1834
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/454
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/454/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/454
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3366
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3366/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2052
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2052/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/622/rebuild

review: Needs Fixing (continuous-integration)
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/270/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1836
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/214
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/214/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/214
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3370
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3370/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10087
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2054
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2054/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
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/271/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1847
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/215
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/215/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/215
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3395
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3395/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2066
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2066/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmlapicheck.py'
2--- tests/qmlapicheck.py 2014-07-03 13:30:32 +0000
3+++ tests/qmlapicheck.py 2014-07-18 16:10:43 +0000
4@@ -23,7 +23,7 @@
5
6 if len(sys.argv) < 2 or '-h' in sys.argv or '--help' in sys.argv:
7 basename = os.path.basename(sys.argv[0])
8- print (
9+ sys.exit(
10 'Usage:\n env BUILTINS=foo,bar %s FILENAME [FILENAME2..N]\n\n'
11 ' Generate a QML API file\n'
12 'Example:\n'
13@@ -42,7 +42,6 @@
14 '\n'
15 'Use the following command to see changes in the API:\n'
16 ' diff -Fqml -u components.api{,.new}\n' % (basename, basename))
17- sys.exit(1)
18
19 builtins = os.getenv('BUILTINS', '').split(',')
20 inputfiles = []
21@@ -96,8 +95,7 @@
22 'prototype',
23 'exports']
24 else:
25- print('Unknown filetype %s' % fileinput.filename())
26- sys.exit(1)
27+ sys.exit('Unknown filetype %s' % fileinput.filename())
28 if fileinput.filename() in classes:
29 classname = ' '.join(classes[fileinput.filename()])
30 else:
31@@ -187,9 +185,9 @@
32 annotated_properties[name] = 'internal'
33 del annotated_properties['internal']
34 if name not in annotated_properties:
35- print(' %s' % (signature))
36- print('Error: Missing \\qmlproperty for %s' % name)
37- sys.exit(1)
38+ sys.exit(
39+ ' %s\nError: Missing \\qmlproperty for %s'
40+ % (signature, name))
41 real_type = annotated_properties[name]
42 signature = signature.replace('alias', real_type)
43 elif filetype == 'qmltypes':

Subscribers

People subscribed via source and target branches