github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewritte util.* -> wait.* wherever reasonable

Browse Source
This commit is contained in:
Jan Chaloupka
2016-02-02 11:57:06 +01:00
parent 43a47a8234
commit 4389b3f0d6
71 changed files with 231 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/config/file_test.go
View File

@@ -29,8 +29,8 @@ import (
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/securitycontext"
"k8s.io/kubernetes/pkg/util"
utiltesting "k8s.io/kubernetes/pkg/util/testing"
"k8s.io/kubernetes/pkg/util/wait"
)
func TestExtractFromNonExistentFile(t *testing.T) {
@@ -53,7 +53,7 @@ func TestUpdateOnNonExistentFile(t *testing.T) {
t.Fatalf("Expected %#v, Got %#v", expected, update)
}
case <-time.After(util.ForeverTestTimeout):
case <-time.After(wait.ForeverTestTimeout):
t.Errorf("Expected update, timeout instead")
}
}
@@ -154,7 +154,7 @@ func TestReadPodsFromFile(t *testing.T) {
if !api.Semantic.DeepEqual(testCase.expected, update) {
t.Errorf("%s: Expected %#v, Got %#v", testCase.desc, testCase.expected, update)
}
case <-time.After(util.ForeverTestTimeout):
case <-time.After(wait.ForeverTestTimeout):
t.Errorf("%s: Expected update, timeout instead", testCase.desc)
}
}()