kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tests

This commit is contained in:
Justin Santa Barbara 2017-02-06 16:23:00 -05:00
parent 2d37ab1ca5
commit 32bd620f36
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/integration/channel/integration_test.go
View File

@ -80,13 +80,13 @@ func TestKopsUpgrades(t *testing.T) {
for _, g := range grid { for _, g := range grid {
kopsVersion := semver.MustParse(g.KopsVersion) kopsVersion := semver.MustParse(g.KopsVersion)
versionInfo := kops.FindVersionInfo(channel.Spec.KopsVersions, kopsVersion) versionInfo := kops.FindKopsVersionSpec(channel.Spec.KopsVersions, kopsVersion)
if versionInfo == nil { if versionInfo == nil {
t.Errorf("unable to find version information for kops version %q in channel", kopsVersion) t.Errorf("unable to find version information for kops version %q in channel", kopsVersion)
continue continue
} }
actual, err := kops.FindRecommendedUpgrade(versionInfo, kopsVersion) actual, err := versionInfo.FindRecommendedUpgrade(kopsVersion)
if g.ExpectedError { if g.ExpectedError {
if err == nil { if err == nil {
t.Errorf("expected error from FindRecommendedUpgrade(%q)", g.KopsVersion) t.Errorf("expected error from FindRecommendedUpgrade(%q)", g.KopsVersion)
@ -98,12 +98,12 @@ func TestKopsUpgrades(t *testing.T) {
continue continue
} }
} }
if actual != g.ExpectedUpgrade { if semverString(actual) != g.ExpectedUpgrade {
t.Errorf("unexpected result from IsUpgradeRequired(%q): expected=%q, actual=%q", g.KopsVersion, g.ExpectedUpgrade, actual) t.Errorf("unexpected result from IsUpgradeRequired(%q): expected=%q, actual=%q", g.KopsVersion, g.ExpectedUpgrade, actual)
continue continue
} }
required, err := kops.IsUpgradeRequired(versionInfo, kopsVersion) required, err := versionInfo.IsUpgradeRequired(kopsVersion)
if err != nil { if err != nil {
t.Errorf("unexpected error from IsUpgradeRequired(%q)", g.KopsVersion, err) t.Errorf("unexpected error from IsUpgradeRequired(%q)", g.KopsVersion, err)
continue continue
@ -174,13 +174,13 @@ func TestKubernetesUpgrades(t *testing.T) {
for _, g := range grid { for _, g := range grid {
kubernetesVersion := semver.MustParse(g.KubernetesVersion) kubernetesVersion := semver.MustParse(g.KubernetesVersion)
versionInfo := kops.FindVersionInfo(channel.Spec.KubernetesVersions, kubernetesVersion) versionInfo := kops.FindKubernetesVersionSpec(channel.Spec.KubernetesVersions, kubernetesVersion)
if versionInfo == nil { if versionInfo == nil {
t.Errorf("unable to find version information for kubernetes version %q in channel", kubernetesVersion) t.Errorf("unable to find version information for kubernetes version %q in channel", kubernetesVersion)
continue continue
} }
actual, err := kops.FindRecommendedUpgrade(versionInfo, kubernetesVersion) actual, err := versionInfo.FindRecommendedUpgrade(kubernetesVersion)
if g.ExpectedError { if g.ExpectedError {
if err == nil { if err == nil {
t.Errorf("expected error from FindRecommendedUpgrade(%q)", g.KubernetesVersion) t.Errorf("expected error from FindRecommendedUpgrade(%q)", g.KubernetesVersion)
@ -192,12 +192,12 @@ func TestKubernetesUpgrades(t *testing.T) {
continue continue
} }
} }
if actual != g.ExpectedUpgrade { if semverString(actual) != g.ExpectedUpgrade {
t.Errorf("unexpected result from IsUpgradeRequired(%q): expected=%q, actual=%q", g.KubernetesVersion, g.ExpectedUpgrade, actual) t.Errorf("unexpected result from IsUpgradeRequired(%q): expected=%q, actual=%q", g.KubernetesVersion, g.ExpectedUpgrade, actual)
continue continue
} }
required, err := kops.IsUpgradeRequired(versionInfo, kubernetesVersion) required, err := versionInfo.IsUpgradeRequired(kubernetesVersion)
if err != nil { if err != nil {
t.Errorf("unexpected error from IsUpgradeRequired(%q)", g.KubernetesVersion, err) t.Errorf("unexpected error from IsUpgradeRequired(%q)", g.KubernetesVersion, err)
continue continue
@ -249,3 +249,10 @@ func TestFindImage(t *testing.T) {
} }
} }
} }
func semverString(sv *semver.Version) string {
if sv == nil {
return ""
}
return sv.String()
}