Expose machine.MarkForRemoval in provisioner API #6042

Merged
merged 3 commits into from Aug 22, 2016

Conversation

Projects
None yet
4 participants
Member

babbageclunk commented Aug 19, 2016

Part of lp:1585878

Once the machine undertaker is ready the provisioner task will mark machines for removal instead of removing them directly.

From talking to thumper, there's no need to bump the version of the provisioner facade as long as this gets into the beta.

+ c.Assert(results, gc.HasLen, 6)
+ c.Check(results[0].Error, gc.IsNil)
+ c.Check(*results[1].Error, gc.Equals,
+ *common.ServerError(errors.NotFoundf("machine 100")))
@fwereade

fwereade Aug 22, 2016

Contributor

Explicitly checking the code (IsCodeNotFound?) is probably best here -- that's what any consumer will actually be responding to. (It's also nice to check the message too, but the code is the really important thing.)

@dimitern

dimitern Aug 22, 2016

Contributor

+1

c.Check(results[1].Error, jc.Satisfies, params.IsCodeNotFound)

(IIRC)

@babbageclunk

babbageclunk Aug 22, 2016

Member

Thanks - added.

Contributor

fwereade commented Aug 22, 2016

It would be really nice if these weren't full-stack tests, but we can't fix everything at once. LGTM with trivially tweaked error-checking.

Contributor

dimitern commented Aug 22, 2016

LGTM as well

babbageclunk added some commits Aug 18, 2016

Expose machine.MarkForRemoval in provisioner API
Once the machine undertaker is ready the provisioner task will mark
machines for removal instead of removing them directly.
Member

babbageclunk commented Aug 22, 2016

$$merge$$

Contributor

jujubot commented Aug 22, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

Contributor

jujubot commented Aug 22, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/8869

Member

babbageclunk commented Aug 22, 2016

Ugh, fixed stupid typo. Could've sworn I'd rerun those tests!
$$merge$$

Contributor

jujubot commented Aug 22, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit ac3699c into juju:master Aug 22, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment