Reduce test flakiness

This commit is contained in:
John Gardiner Myers 2020-05-22 19:26:42 -07:00
parent e6d73b5ba0
commit af90ecdddf
1 changed files with 4 additions and 2 deletions

View File

@ -979,8 +979,10 @@ func (c *concurrentTest) TerminateInstances(input *ec2.TerminateInstancesInput)
return c.EC2API.TerminateInstances(input) return c.EC2API.TerminateInstances(input)
} }
const postTerminationValidationDelay = 100 * time.Millisecond // NodeInterval plus some
func (c *concurrentTest) delayThenWakeValidation() { func (c *concurrentTest) delayThenWakeValidation() {
time.Sleep(20 * time.Millisecond) // NodeInterval plus some time.Sleep(postTerminationValidationDelay)
select { select {
case c.validationChan <- true: case c.validationChan <- true:
default: default:
@ -1245,7 +1247,7 @@ func (t *alreadyDetachedTest) Validate() (*validation.ValidationCluster, error)
assert.Equal(t.t, t.numValidations, len(t.detached), "numnber of detached instances") assert.Equal(t.t, t.numValidations, len(t.detached), "numnber of detached instances")
case 4: case 4:
t.mutex.Unlock() t.mutex.Unlock()
time.Sleep(20 * time.Millisecond) // NodeInterval plus some time.Sleep(postTerminationValidationDelay)
t.mutex.Lock() t.mutex.Lock()
assert.Equal(t.t, 1, t.terminationRequestsLeft, "terminations left") assert.Equal(t.t, 1, t.terminationRequestsLeft, "terminations left")
case 5: case 5: