github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

updates based off reviews

Browse Source
This commit is contained in:
Marek Counts 2019-06-14 14:16:44 -04:00
parent bf376e863c
commit b66c4e8d45
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cmd/kubeadm/app/util/version_test.go
View File

@ -50,10 +50,7 @@ func TestValidVersion(t *testing.T) {
} }
for _, s := range validVersions { for _, s := range validVersions {
t.Run(s, func(t *testing.T) { t.Run(s, func(t *testing.T) {
fileFetcher := func(url string, timeout time.Duration) (string, error) { ver, err := kubernetesReleaseVersion(s, errorFetcher)
return "", errors.New("should not make internet call")
}
ver, err := kubernetesReleaseVersion(s, fileFetcher)
t.Log("Valid: ", s, ver, err) t.Log("Valid: ", s, ver, err)
if err != nil { if err != nil {
t.Errorf("KubernetesReleaseVersion unexpected error for version %q: %v", s, err) t.Errorf("KubernetesReleaseVersion unexpected error for version %q: %v", s, err)
@ -75,10 +72,7 @@ func TestInvalidVersion(t *testing.T) {
} }
for _, s := range invalidVersions { for _, s := range invalidVersions {
t.Run(s, func(t *testing.T) { t.Run(s, func(t *testing.T) {
fileFetcher := func(url string, timeout time.Duration) (string, error) { ver, err := kubernetesReleaseVersion(s, errorFetcher)
return "should not make internet calls", errors.New("should not make internet call")
}
ver, err := kubernetesReleaseVersion(s, fileFetcher)
t.Log("Invalid: ", s, ver, err) t.Log("Invalid: ", s, ver, err)
if err == nil { if err == nil {
t.Errorf("KubernetesReleaseVersion error expected for version %q, but returned successfully", s) t.Errorf("KubernetesReleaseVersion error expected for version %q, but returned successfully", s)
@ -98,10 +92,7 @@ func TestValidConvenientForUserVersion(t *testing.T) {
} }
for _, s := range validVersions { for _, s := range validVersions {
t.Run(s, func(t *testing.T) { t.Run(s, func(t *testing.T) {
fileFetcher := func(url string, timeout time.Duration) (string, error) { ver, err := kubernetesReleaseVersion(s, errorFetcher)
return "", errors.New("should not make internet call")
}
ver, err := kubernetesReleaseVersion(s, fileFetcher)
t.Log("Valid: ", s, ver, err) t.Log("Valid: ", s, ver, err)
if err != nil { if err != nil {
t.Errorf("KubernetesReleaseVersion unexpected error for version %q: %v", s, err) t.Errorf("KubernetesReleaseVersion unexpected error for version %q: %v", s, err)
@ -130,17 +121,21 @@ func TestVersionFromNetwork(t *testing.T) {
"unknown": {"The requested URL was not found on this server.", "", true}, "unknown": {"The requested URL was not found on this server.", "", true},
} }
fileFetcher := func(url string, timeout time.Duration) (string, error) {
key := strings.TrimSuffix(path.Base(url), ".txt")
res, found := cases[key]
if found {
return res.Content, nil
}
return "Unknown test case key!", errors.New("unknown test case key")
}
for k, v := range cases { for k, v := range cases {
t.Run(k, func(t *testing.T) { t.Run(k, func(t *testing.T) {
fileFetcher := func(url string, timeout time.Duration) (string, error) {
key := strings.TrimSuffix(path.Base(url), ".txt")
res, found := cases[key]
if found {
if v.ErrorExpected {
return "error", errors.New("expected error")
}
return res.Content, nil
}
return "Unknown test case key!", errors.New("unknown test case key")
}
ver, err := kubernetesReleaseVersion(k, fileFetcher) ver, err := kubernetesReleaseVersion(k, fileFetcher)
t.Logf("Key: %q. Result: %q, Error: %v", k, ver, err) t.Logf("Key: %q. Result: %q, Error: %v", k, ver, err)
switch { switch {
@ -282,7 +277,7 @@ func TestCIBuildVersion(t *testing.T) {
if tc.valid { if tc.valid {
return tc.expected, nil return tc.expected, nil
} }
return "Unknown test case key!", fmt.Errorf("unknown test case key") return "Unknown test case key!", errors.New("unknown test case key")
} }
ver, err := kubernetesReleaseVersion(tc.input, fileFetcher) ver, err := kubernetesReleaseVersion(tc.input, fileFetcher)
@ -482,3 +477,7 @@ func TestValidateStableVersion(t *testing.T) {
}) })
} }
} }
func errorFetcher(url string, timeout time.Duration) (string, error) {
return "should not make internet calls", fmt.Errorf("should not make internet calls, tried to request url: %s", url)
}