juju-ci-tools

Merge lp://staging/~gz/juju-ci-tools/argparser_descriptions into lp://staging/juju-ci-tools

  1. argparser_descriptions
  2. Merge into trunk
Proposed by Martin Packman
Status: Needs review
Proposed branch: lp://staging/~gz/juju-ci-tools/argparser_descriptions
Merge into: lp://staging/juju-ci-tools
Diff against target: 692 lines (+105/-88)
23 files modified
assess_log_rotation.py (+6/-5)
assess_recovery.py (+5/-4)
build_juju.py (+4/-3)
build_vagrant_boxes.py (+7/-6)
candidate.py (+4/-3)
check_blockers.py (+4/-3)
clean_resources.py (+1/-1)
cloud_deploy.py (+7/-6)
deploy_job.py (+6/-1)
deploy_stack.py (+14/-12)
get_ami.py (+8/-8)
gotesttarfile.py (+5/-4)
joyent.py (+4/-5)
jujuci.py (+3/-3)
test_assess_recovery.py (+4/-3)
test_build_juju.py (+2/-2)
test_check_blockers.py (+4/-2)
test_deploy_stack.py (+3/-3)
test_get_ami.py (+1/-1)
test_gotesttarfile.py (+1/-1)
test_jujuci.py (+6/-6)
test_winazure.py (+3/-3)
winazure.py (+3/-3)
To merge this branch: bzr merge lp://staging/~gz/juju-ci-tools/argparser_descriptions
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+264165@code.staging.launchpad.net

Commit message

Refactor script entry points and fix descriptions

Description of the change

Adds description= where intended in ArgumentParser construction and makes our main/parse_args usage a little more consistent.

Pattern suggested in this branch is always use:

    if __name__ == "__main__":
        sys.exit(main(sys.argv))

Then either chop the argv on passing to parse_args helper or inside. The main function should always return an int for the exit code.

Some tests updated along with the changes, no major functional differences.

To post a comment you must log in.
lp://staging/~gz/juju-ci-tools/argparser_descriptions updated
1017. By Martin Packman

Merge trunk to resolve conflicts

Revision history for this message
Aaron Bentley (abentley) wrote :

This should be at least two branches. It's significantly more than 400 lines, and is doing several things at once. (changing description, changing main() conventions).

That said, it is landable, but please consider restoring the bool() as indicated inline.

review: Approve
Reply

Unmerged revisions

1017. By Martin Packman

Merge trunk to resolve conflicts

1016. By Martin Packman

Tidy up use of ArgumentParser in our scripts

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