Code review comment for lp:~brad-marshall/charms/precise/bip/add-amulet-tests

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