Moving structure test's dependency file extraction logic to NewTester…

…() to reduce code redundancy.
GoogleContainerTools · Feb 22, 2021 · 5e1d859 · 5e1d859
1 parent 7c2083f
commit 5e1d859
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/pkg/skaffold/test/test_factory.go b/pkg/skaffold/test/test_factory.go
@@ -44,13 +44,12 @@ type Config interface {
 // and returns a Tester instance with all the necessary test runners
 // to run all specified tests.
 func NewTester(cfg Config, imagesAreLocal func(imageName string) (bool, error)) (Tester, error) {
-	runner, err := getRunner(cfg, imagesAreLocal, cfg.TestCases())
+	runner, err := getRunners(cfg, imagesAreLocal, cfg.TestCases())
 	if err != nil {
 		return nil, err
 	}
 
 	return FullTester{
-		// runners: getRunner(cfg, imagesAreLocal, cfg.TestCases()),
 		runners: runner,
 		muted:   cfg.Muted(),
 	}, nil
@@ -113,7 +112,7 @@ func (t FullTester) runTests(ctx context.Context, out io.Writer, bRes []build.Ar
 	return nil
 }
 
-func getRunner(cfg Config, imagesAreLocal func(imageName string) (bool, error), tcs []*latest.TestCase) ([]runner, error) {
+func getRunners(cfg Config, imagesAreLocal func(imageName string) (bool, error), tcs []*latest.TestCase) ([]runner, error) {
 	var runners []runner
 	for _, tc := range tcs {
 		if len(tc.StructureTests) != 0 {

diff --git a/pkg/skaffold/test/test_factory_test.go b/pkg/skaffold/test/test_factory_test.go
@@ -81,17 +81,18 @@ func TestWrongPattern(t *testing.T) {
 			}},
 		}
 
-		tester, err := NewTester(cfg, func(imageName string) (bool, error) { return true, nil })
-		t.CheckNoError(err)
-
-		_, err = tester.TestDependencies()
+		_, err := NewTester(cfg, func(imageName string) (bool, error) { return true, nil })
+		// t.CheckNoError(err)
 		t.CheckError(true, err)
 
-		err = tester.Test(context.Background(), ioutil.Discard, []build.Artifact{{
-			ImageName: "image",
-			Tag:       "image:tag",
-		}})
-		t.CheckError(true, err)
+		// _, err = tester.TestDependencies()
+		// t.CheckError(true, err)
+
+		// err = tester.Test(context.Background(), ioutil.Discard, []build.Artifact{{
+		// 	ImageName: "image",
+		// 	Tag:       "image:tag",
+		// }})
+		// t.CheckError(true, err)
 	})
 }