/juju

Backport fixes #8157

Merged
merged 4 commits into from Nov 30, 2017

Conversation

Reviewers

@wallyworld wallyworld

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@axw @jujubot @wallyworld
@axw
Member

axw commented Nov 30, 2017

Backport test fixes from develop to 2.3.

axw added some commits Nov 28, 2017

@axw
firewaller: improve firewaller egress watcher 
The firewaller's egress address watcher has
been changed to wait for the initial event
of each watcher before doing sending any
output. It was previously waiting for some
initial events, but missed the relation units.
Due to this, tests would intermittently fail.

By waiting for the initial event of each
watcher, we can also eliminate the explicit
initialisation step in the watcher.
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
f927c8b
@axw
firewaller: fix bare channel send deadlock 
Fix a bug in the firewaller's egress address watcher,
where the embedded machine address watcher was performing
bare channel sends. During worker termination, this could
lead to deadlock (and was causing tests to timeout).
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
d019f71
@axw
state: fix LeadershipSuite.TestCheck 
Use the specified application name when
expiring the leadership claim. Fix the
"expire" method to deal with non-
deterministic ordering/number of clock
alarms. Use "time.After" instead of the
test clock for test timeouts.

Fixes https://bugs.launchpad.net/juju/+bug/1735153
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
ed9792c
@axw
apiserver/common/firewall: fix ordering in test 
Fix test to handle changing order of calls,
due to iteration over map keys.
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
cdcc2db
@axw
Member

axw commented Nov 30, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Nov 30, 2017

Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju

@jujubot jujubot merged commit be845bf into juju:2.3 Nov 30, 2017
1 check failed

1 check failed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment