Fix versioncmp for ce edition

StefanScherer · StefanScherer · commit efe0ca527346 · 2017-06-09T12:45:28.000+02:00
Signed-off-by: Stefan Scherer &lt;scherer_stefan@icloud.com&gt;
diff --git a/libmachine/versioncmp/compare.go b/libmachine/versioncmp/compare.go
@@ -29,10 +29,10 @@ func compare(v1, v2 string) int {
 	// presence of the "ce" string in the version string) are "less than"
 	// any community edition release (first occuring in March 2017).
 	if strings.Contains(v1, ceEdition) && !strings.Contains(v2, ceEdition) {
-		return -1
+		return 1
 	}
 	if !strings.Contains(v1, ceEdition) && strings.Contains(v2, ceEdition) {
-		return 1
+		return -1
 	}
 
 	// Without this tag, both are pre-CE versions.
diff --git a/libmachine/versioncmp/compare_test.go b/libmachine/versioncmp/compare_test.go
@@ -33,6 +33,8 @@ func TestCompare(t *testing.T) {
 		{"17.03.0-ce", "17.06.0-ce", -1},
 		{"17.03.0-ce-rc2", "17.03.0-ce-rc1", 1},
 		{"17.03.0-ce-rc1", "18.03.0-ce-rc1", -1},
+		{"17.06.0-ce-rc2", "1.12.0", 1},
+		{"1.12.0", "17.06.0-ce-rc2", -1},
 	}
 
 	for _, tc := range cases {

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ func compare(v1, v2 string) int {`
`29`	`29`	`// presence of the "ce" string in the version string) are "less than"`
`30`	`30`	`// any community edition release (first occuring in March 2017).`
`31`	`31`	`if strings.Contains(v1, ceEdition) && !strings.Contains(v2, ceEdition) {`
`32`		`- return -1`
	`32`	`+ return 1`
`33`	`33`	`}`
`34`	`34`	`if !strings.Contains(v1, ceEdition) && strings.Contains(v2, ceEdition) {`
`35`		`- return 1`
	`35`	`+ return -1`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// Without this tag, both are pre-CE versions.`