github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Deflake TestSyncDeploymentDeletionRace

Browse Source 
The cache was sometimes catching up while we were testing the case
where the cache is not yet caught up.

Before this fix, I could reproduce the failure with the following
command. After the fix, it passes.

```
go test -count 100000 -run TestSyncDeploymentDeletionRace
```
This commit is contained in:
Anthony Yeh
2017-03-20 11:13:26 -07:00
parent 38055983e0
commit 0b9233648e
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/controller/deployment/deployment_controller_test.go
View File

@@ -195,19 +195,21 @@ func (f *fixture) newController() (*DeploymentController, informers.SharedInform
return c, informers return c, informers
} }
func (f *fixture) runExpectError(deploymentName string) { func (f *fixture) runExpectError(deploymentName string, startInformers bool) {
f.run_(deploymentName, true) f.run_(deploymentName, startInformers, true)
} }
func (f *fixture) run(deploymentName string) { func (f *fixture) run(deploymentName string) {
f.run_(deploymentName, false) f.run_(deploymentName, true, false)
} }
func (f *fixture) run_(deploymentName string, expectError bool) { func (f *fixture) run_(deploymentName string, startInformers bool, expectError bool) {
c, informers := f.newController() c, informers := f.newController()
stopCh := make(chan struct{}) if startInformers {
defer close(stopCh) stopCh := make(chan struct{})
informers.Start(stopCh) defer close(stopCh)
informers.Start(stopCh)
}
err := c.syncDeployment(deploymentName) err := c.syncDeployment(deploymentName)
if !expectError && err != nil { if !expectError && err != nil {
@@ -329,7 +331,8 @@ func TestSyncDeploymentDeletionRace(t *testing.T) {
// Expect to only recheck DeletionTimestamp. // Expect to only recheck DeletionTimestamp.
f.expectGetDeploymentAction(d) f.expectGetDeploymentAction(d)
// Sync should fail and requeue to let cache catch up. // Sync should fail and requeue to let cache catch up.
f.runExpectError(getKey(d, t)) // Don't start informers, since we don't want cache to catch up for this test.
f.runExpectError(getKey(d, t), false)
} }
// issue: https://github.com/kubernetes/kubernetes/issues/23218 // issue: https://github.com/kubernetes/kubernetes/issues/23218