tree 81dcfc6302b4df482a997ff73c196caca1443a3f
parent a70ad9b1043052309aa968ee13dd5a781ac3d286
author James E. Blair <jeblair@redhat.com> 1501170685 -0700
committer James E. Blair <jeblair@redhat.com> 1501170685 -0700

Fix race in test_periodic_override

The main body of the test used a config with a job with a branch selector
so that even though the timer trigger fired 2 events, only one of them would
result in a job being run.  However, the second config which the test switched
to in order to disable the timer dropped the branch selector, meaning that
in some cases an event in progress could end up causing a second job to start
running.  Add a new second configuration which retains the branch selector
to correct this.

Also, add some waitUntilSettled methods after the second reconfiguration, even
though they still shouldn't be strictly necessary.  If there are any more
race conditions, this should serve to stabilize them.

Change-Id: I309983148739943cb810e84322551e830d80cac5