Merge pull request #119 from ozontech/118-table-test-not-working

Run BeforeAll hook before collecting table tests

Author: koodeex

pkg/framework/runner/runner.go

@@ -18,9 +18,10 @@ import (
 )
 
 type runner struct {
-	internalT internalT
-	testPlan  *testplan.TestPlan
-	tests     map[string]Test
+	internalT        internalT
+	testPlan         *testplan.TestPlan
+	tests            map[string]Test
+	adjustTableTests func()
 }
 
 func NewRunner(realT TestingT, suiteName string) TestRunner {
@@ -127,13 +128,6 @@ func (r *runner) RunTests() SuiteResult {
 
 		defer r.t().SetRealT(oldParentT)
 
-		r.tests = r.filterByTestPlan()
-
-		if len(r.tests) == 0 {
-			r.t().Skipf("No tests to run for suite %s", r.t().Name())
-			return
-		}
-
 		defer wg.Wait()
 		defer finishSuite(r.internalT.GetProvider())
 		defer func() { _, _ = runHook(r.t(), afterAllHook) }()
@@ -169,6 +163,17 @@ func (r *runner) RunTests() SuiteResult {
 			return
 		}
 
+		if r.adjustTableTests != nil {
+			r.adjustTableTests()
+		}
+
+		r.tests = r.filterByTestPlan()
+
+		if len(r.tests) == 0 {
+			r.t().Skipf("No tests to run for suite %s", r.t().Name())
+			return
+		}
+
 		// HACK: t.Parallel() waits for parent-test reach its defer function
 		// Unfortunately it's impossible to reach this function if parent-test waits for other tests complete
 		// So if we run child test from test-runner

pkg/framework/runner/suite_runner.go

@@ -87,6 +87,10 @@ func newSuiteRunner(
 		suite:       suite,
 	}
 
+	r.adjustTableTests = func() {
+		initializeParametrizedTests(r)
+	}
+
 	collectTests(r, suite)
 	collectParametrizedTests(r, suite)
 	collectHooks(r, suite)
@@ -160,9 +164,8 @@ func parametrizedWrap(runner *suiteRunner, beforeAll func(provider.T)) func(t pr
 func collectParametrizedTests(runner *suiteRunner, suite TestSuite) {
 	if ps, ok := suite.(ParametrizedSuite); ok {
 		ps.InitializeTestsParams()
+		initializeParametrizedTests(runner)
 	}
-
-	initializeParametrizedTests(runner)
 }
 
 func initializeParametrizedTests(runner *suiteRunner) {