qtcreator-plugin-ubuntu

Merge lp://staging/~elopio/qtcreator-plugin-ubuntu/uitk_base_class-2 into lp://staging/qtcreator-plugin-ubuntu

  1. uitk_base_class-2
  2. Merge into trunk
Proposed by Zoltan Balogh
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 59
Merged at revision: 78
Proposed branch: lp://staging/~elopio/qtcreator-plugin-ubuntu/uitk_base_class-2
Merge into: lp://staging/qtcreator-plugin-ubuntu
Diff against target: 279 lines (+78/-156)
4 files modified
share/qtcreator/templates/wizards/ubuntu/projectypes.json (+1/-4)
share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/__init__.py (+60/-120)
share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/main/__init__.py (+0/-1)
share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/test_main.py (+17/-31)
To merge this branch: bzr merge lp://staging/~elopio/qtcreator-plugin-ubuntu/uitk_base_class-2
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zoltan Balogh Approve
Corey Goldberg Pending
Thomi Richards Pending
Review via email: mp+204284@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-01-31.

Commit message

Have a nice comment to please jenkins

Description of the change

Got a pretty description to make the CI happy

To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote : Posted in a previous version of this proposal

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/64

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtcreator-plugin-ubuntu-ci/64/rebuild

review: Approve (continuous-integration)
Revision history for this message
Corey Goldberg (coreygoldberg) wrote : Posted in a previous version of this proposal

nice. lgtm

review: Approve
Revision history for this message
Corey Goldberg (coreygoldberg) wrote : Posted in a previous version of this proposal

request:
use single quotes in templates instead of double quotes :)

<cgoldberg> elopio, approved your template branch. so you prefer double quotes over single quote, eh? That the *one* thing pep8 doesn't specify, and I get OCD about :)
<elopio> cgoldberg: no, I prefer single quotes.
<cgoldberg> elopio, then let's change the template to use them :) I do too
<elopio> cgoldberg: yes man!
<cgoldberg> that way we can spread the single quote gospel further
<nuclearbob> woo single quotes!
<cgoldberg> victory!
 (but I think thomi prefers double quotes.. or at least that's what most of autopilot uses internally)
<elopio> cgoldberg: I might start hating myself for asking this, but do you have a reason for prefering single quotes?
<elopio> I just find them pretty, but I hate when I write a message that has the words 'didn\'t'
<cgoldberg> elopio, habit.. i forget the exact reason.. but it started when I used Perl... both double and single work, but most of the good Perl hackers used single... so I got in that habit and dragged it to python i guess
 elopio, I double quote when a string contains a single... "didn't"
 otherwise its always single
<elopio> cgoldberg: ok, that's what I do.
<elopio> lets say from now on that great python hackers use single quotes :D

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/67

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtcreator-plugin-ubuntu-ci/67/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/70/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/1/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/qtcreator-plugin-ubuntu-ci/70/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:59
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~elopio/qtcreator-plugin-ubuntu/uitk_base_class-2/+merge/204223/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/50

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/119/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

Good to go

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

PASSED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/52

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/121/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

OK

review: Approve
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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: