Skip to content

Commit

Permalink
Merge pull request kubernetes#65376 from mindprince/to-done
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 65377, 63837, 65370, 65294, 65376). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Remove unneeded sleep from test.

The race condition that required this sleep was fixed in google/cadvisor#1969.
That was vendored in kubernetes#65334.

```release-note
NONE
```

/assign @jiayingz @vishh
  • Loading branch information
Kubernetes Submit Queue authored Jun 22, 2018
2 parents 4fa7474 + 9a9c2ae commit 5e9a565
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions test/e2e/instrumentation/monitoring/accelerator.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ func testStackdriverAcceleratorMonitoring(f *framework.Framework) {

scheduling.SetupNVIDIAGPUNode(f, false)

// TODO: remove this after cAdvisor race is fixed.
time.Sleep(time.Minute)

f.PodClient().Create(&v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: rcName,
Expand Down

0 comments on commit 5e9a565

Please sign in to comment.