kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce test flakiness

This commit is contained in:
John Gardiner Myers 2020-01-12 21:27:23 -08:00
parent 10d6416b8e
commit 5f72d12132
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/instancegroups/rollingupdate_test.go
View File

@ -693,7 +693,11 @@ func (c *concurrentTest) Validate() (*validation.ValidationCluster, error) {
c.t.Errorf("unexpected call to Validate with %d termination requests left", terminationRequestsLeft) c.t.Errorf("unexpected call to Validate with %d termination requests left", terminationRequestsLeft)
case 4: case 4:
assert.Equal(c.t, 6, c.previousValidation, "previous validation") assert.Equal(c.t, 6, c.previousValidation, "previous validation")
c.terminationChan <- true select {
case c.terminationChan <- true:
default:
c.t.Error("terminationChan is full")
}
c.mutex.Unlock() c.mutex.Unlock()
select { select {
case <-c.validationChan: case <-c.validationChan:
@ -705,7 +709,11 @@ func (c *concurrentTest) Validate() (*validation.ValidationCluster, error) {
assert.Equal(c.t, 4, c.previousValidation, "previous validation") assert.Equal(c.t, 4, c.previousValidation, "previous validation")
case 1: case 1:
assert.Equal(c.t, 2, c.previousValidation, "previous validation") assert.Equal(c.t, 2, c.previousValidation, "previous validation")
c.terminationChan <- true select {
case c.terminationChan <- true:
default:
c.t.Error("terminationChan is full")
}
c.mutex.Unlock() c.mutex.Unlock()
select { select {
case <-c.validationChan: case <-c.validationChan:
@ -745,8 +753,12 @@ func (c *concurrentTest) TerminateInstanceInAutoScalingGroup(input *autoscaling.
} }
func (c *concurrentTest) delayThenWakeValidation() { func (c *concurrentTest) delayThenWakeValidation() {
time.Sleep(2 * time.Millisecond) // NodeInterval plus some time.Sleep(20 * time.Millisecond) // NodeInterval plus some
c.validationChan <- true select {
case c.validationChan <- true:
default:
c.t.Error("validationChan is full")
}
} }
func (c *concurrentTest) AssertComplete() { func (c *concurrentTest) AssertComplete() {