/juju

More tolerant call checks #6685

Merged
merged 1 commit into from Dec 9, 2016

Conversation

Reviewers

@natefinch natefinch

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@wallyworld @jujubot @natefinch
@wallyworld
Owner

wallyworld commented Dec 9, 2016

Hopefully fixes failure seen in http://juju-ci.vapour.ws:8080/job/github-merge-juju/9829/artifact/artifacts/trusty-out.log

Also drive by fmt fixes.
@natefinch

natefinch approved these changes Dec 9, 2016
View changes

LGTM with one small nitpick
Notably, I have no idea if this will fix the problem or not, but it seems sane.

worker/remoterelations/remoterelations_test.go
+ s.waitForStubCalls(c, s.stub, expected)
+}
+
+func (s *remoteRelationsSuite) waitForStubCalls(c *gc.C, stub *jujutesting.Stub, expected []jujutesting.StubCall) {
@natefinch

natefinch Dec 9, 2016

Contributor

this should just a function, since it doesn't use the receiver now

@wallyworld

wallyworld Dec 9, 2016

Owner

fixed - made it just a function

@wallyworld
Owner

wallyworld commented Dec 9, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Dec 9, 2016

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

@jujubot jujubot merged commit c3a95e5 into juju:develop Dec 9, 2016
1 check failed

1 check failed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details

wallyworld added a commit to wallyworld/juju that referenced this pull request Dec 14, 2016

@jujubot @wallyworld
Merge pull request #6685 from wallyworld/cmr-worker-test-fail 
More tolerant call checks

Hopefully fixes failure seen in http://juju-ci.vapour.ws:8080/job/github-merge-juju/9829/artifact/artifacts/trusty-out.log

Also drive by fmt fixes.
055e21b

jujubot added a commit that referenced this pull request Dec 14, 2016

@jujubot
Merge pull request #6709 from wallyworld/cmr-worker-test-fail-2.1 
Merge pull request #6685 from wallyworld/cmr-worker-test-fail

Fixes: https://bugs.launchpad.net/juju/+bug/1646861

More tolerant call checks

Hopefully fixes failure seen in http://juju-ci.vapour.ws:8080/job/github-merge-juju/9829/artifact/artifacts/trusty-out.log
005c9fc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment