Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/apiStdErr into lp:ubuntu-ui-toolkit/staging
- apiStdErr
- Merge into staging
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 |
Related bugs: |
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
Description of the change
Tim Peeters (tpeeters) wrote : | # |
(proof that it works):
tim@C720:
M tests/qmlapiche
All changes applied successfully.
tim@C720:
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/
readonly property alias sections
Error: Missing \qmlproperty for sections
Error: qmlapicheck.py failed
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1144
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1145
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Tim Peeters (tpeeters) wrote : | # |
./tests/
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1146
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Preview Diff
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': |
works, thanks