firewaller: integration after rejection

firewaller: integration after rejection

The refactored firewaller let the tests in cmd/jujud fail. Tests
led a missing instance id for a machine in machine_test.go and a
wrong handling of environs.ErrNoInstances in firewaller.go, line
272. The rest of the firewaller changes already got two LGTMs
before Dave detected the failure mentioned above.

https://code.launchpad.net/~themue/juju-core/008-firewaller-integration/+merge/142684

(do not edit description out of merge proposal)

[TheMue, 2013-01-10 13:10:04]

Please take a look.

[fwereade, 2013-01-10 13:23:26]

If that (along with the machine_test tweak) is the only change from how it was
before, then LGTM.

[rog, 2013-01-10 15:00:16]

On 2013/01/10 13:23:26, fwereade wrote:
> If that (along with the machine_test tweak) is the only change from how it was
> before, then LGTM.

likewise LGTM.

but in future, if there's a rewound change like this, it's good to propose twice
- once with the originally rewound change, and again with the changes you're
making on top. that way we can easily see what changes have been made since the
original review.

[TheMue, 2013-01-10 15:34:33]

*** Submitted:

firewaller: integration after rejection

The refactored firewaller let the tests in cmd/jujud fail. Tests
led a missing instance id for a machine in machine_test.go and a
wrong handling of environs.ErrNoInstances in firewaller.go, line
272. The rest of the firewaller changes already got two LGTMs
before Dave detected the failure mentioned above.

R=fwereade, rog
CC=
https://codereview.appspot.com/7068059