Match Ginkgo signatures for By and Fail

This allows the framework to use the Ginkgo functions directly, avoiding an extra call (which would affect call stacks in callbacks). Signed-off-by: Stephen Kitt <[email protected]>
tpantelis · Apr 3, 2024 · 72fb58b · 72fb58b
1 parent 17ce6f7
commit 72fb58b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
@@ -64,13 +64,9 @@ func init() {
 }
 
 func RunE2ETests(t *testing.T) bool {
-	framework.SetStatusFunction(func(text string) {
-		By(text)
-	})
+	framework.SetStatusFunction(By)
 
-	framework.SetFailFunction(func(text string) {
-		Fail(text)
-	})
+	framework.SetFailFunction(Fail)
 
 	framework.SetUserAgentFunction(func() string {
 		return fmt.Sprintf("%v -- %v", rest.DefaultKubernetesUserAgent(), CurrentSpecReport().FullText())

diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
@@ -134,16 +134,16 @@ func AddBeforeSuite(beforeSuite func()) {
 }
 
 var (
-	By                func(string)
-	Fail              func(string)
+	By                func(string, ...func())
+	Fail              func(string, ...int)
 	userAgentFunction func() string
 )
 
-func SetStatusFunction(by func(string)) {
+func SetStatusFunction(by func(string, ...func())) {
 	By = by
 }
 
-func SetFailFunction(fail func(string)) {
+func SetFailFunction(fail func(string, ...int)) {
 	Fail = fail
 }
 
@@ -152,10 +152,14 @@ func SetUserAgentFunction(uaf func() string) {
 }
 
 func init() {
-	By = func(str string) {
+	By = func(str string, callbacks ...func()) {
 		fmt.Println(str)
+
+		for _, callback := range callbacks {
+			callback()
+		}
 	}
-	Fail = func(str string) {
+	Fail = func(str string, _ ...int) {
 		panic("Framework Fail:" + str)
 	}
 	userAgentFunction = func() string {