Juju Charms Collection
bip package

Merge lp://staging/~brad-marshall/charms/precise/bip/add-amulet-tests into lp://staging/charms/bip

  1. Precise Pangolin (12.04)
  2. add-amulet-tests
  3. Merge into trunk
Proposed by Brad Marshall
Status: Merged
Merged at revision: 21
Proposed branch: lp://staging/~brad-marshall/charms/precise/bip/add-amulet-tests
Merge into: lp://staging/charms/bip
Diff against target: 132 lines (+52/-54)
3 files modified
tests/00-setup (+0/-5)
tests/10-deploy (+52/-0)
tests/99-autogen (+0/-49)
To merge this branch: bzr merge lp://staging/~brad-marshall/charms/precise/bip/add-amulet-tests
Reviewer Review Type Date Requested Status
José Antonio Rey (community) Approve
Cory Johns (community) Needs Fixing
Review Queue (community) automated testing Needs Fixing
Review via email: mp+241480@code.staging.launchpad.net

Description of the change

Add some basic amulet tests to confirm bip is running, and the port is open. Any extra testing ideas would be great.

I've done some basic testing with trusty and would like to see the charm promulgated to trusty if possible.

Fixed the error reporting on the socket connection testing.

To post a comment you must log in.
lp://staging/~brad-marshall/charms/precise/bip/add-amulet-tests updated
18. By Tim Van Steenburgh

[brad-marshall] Added config options for backlog

19. By Tim Van Steenburgh

[mbruzek] Added tests

Revision history for this message
Review Queue (review-queue) wrote :

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10340-results

review: Needs Fixing (automated testing)
Revision history for this message
Cory Johns (johnsca) wrote :

Brad,

Thanks for adding these tests! It looks like the "failure" reported above is due to a merge conflict between this test and the boilerplate test added in revision #19 [1]. However, these tests are clearly superior, and it should be an easy merge to discard the tests from upstream in favor of these.

However, when running these tests, I found that the backlog changes merged in with revision #18 [2] did not include the variables in the template context, resulting in a broken bip.conf file.

Before approving this, could you please resolve the merge conflict and add the two variables (backlog_lines and backlog_msg_only) to the template context so that the tests can pass?

[1]: http://bazaar.launchpad.net/~charmers/charms/precise/bip/trunk/revision/19
[2]: http://bazaar.launchpad.net/~charmers/charms/precise/bip/trunk/revision/18

review: Needs Fixing
lp://staging/~brad-marshall/charms/precise/bip/add-amulet-tests updated
20. By Brad Marshall

[bradm] Fixed merge conflict from existing tests dir

Revision history for this message
Brad Marshall (brad-marshall) wrote :

I've fixed the merge request to not conflict, please let me know if there's any other issues.

Revision history for this message
José Antonio Rey (jose) wrote :

Hey Brad,

I have just reviewied the addition of these tests. They all pass. Tested with bundletester under EC2. No merge conflicts, everything seems to be in order now.

+1!

Thanks for working on these, greatly appreciated!

review: Approve

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: