Merge pull request #2337 from EmilienM/refactor

pierreprinetti · web-flow · commit a1ac165819cd · 2022-01-30T07:09:20.000+01:00
conditions: use IsReleases* from SkipReleases*
diff --git a/acceptance/clients/conditions.go b/acceptance/clients/conditions.go
@@ -87,7 +87,7 @@ func SkipRelease(t *testing.T, release string) {
 func SkipReleasesBelow(t *testing.T, release string) {
 	current_branch := os.Getenv("OS_BRANCH")
 
-	if current_branch != "master" && current_branch < release {
+	if IsReleasesBelow(t, release) {
 		t.Skipf("this is not supported below %s, testing in %s", release, current_branch)
 	}
 }
@@ -99,7 +99,7 @@ func SkipReleasesAbove(t *testing.T, release string) {
 	current_branch := os.Getenv("OS_BRANCH")
 
 	// Assume master is always too new
-	if current_branch == "master" || current_branch > release {
+	if IsReleasesAbove(t, release) {
 		t.Skipf("this is not supported above %s, testing in %s", release, current_branch)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func SkipRelease(t *testing.T, release string) {`
`87`	`87`	`func SkipReleasesBelow(t *testing.T, release string) {`
`88`	`88`	`current_branch := os.Getenv("OS_BRANCH")`
`89`	`89`
`90`		`- if current_branch != "master" && current_branch < release {`
	`90`	`+ if IsReleasesBelow(t, release) {`
`91`	`91`	`t.Skipf("this is not supported below %s, testing in %s", release, current_branch)`
`92`	`92`	`}`
`93`	`93`	`}`
`@@ -99,7 +99,7 @@ func SkipReleasesAbove(t *testing.T, release string) {`
`99`	`99`	`current_branch := os.Getenv("OS_BRANCH")`
`100`	`100`
`101`	`101`	`// Assume master is always too new`
`102`		`- if current_branch == "master" \|\| current_branch > release {`
	`102`	`+ if IsReleasesAbove(t, release) {`
`103`	`103`	`t.Skipf("this is not supported above %s, testing in %s", release, current_branch)`
`104`	`104`	`}`
`105`	`105`	`}`