Merge pull request kubernetes#92400 from spiffxp/decouple-testfiles

decouple testfiles from framework

Author: k8s-ci-robot

test/e2e/e2e_test.go

@@ -110,7 +110,11 @@ func TestMain(m *testing.M) {
 			File        string `yaml:"file"`
 		}
 
-		data := testfiles.ReadOrDie("test/conformance/testdata/conformance.yaml")
+		data, err := testfiles.Read("test/conformance/testdata/conformance.yaml")
+		if err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			os.Exit(1)
+		}
 		if err := yaml.Unmarshal(data, &tests); err != nil {
 			fmt.Fprintln(os.Stderr, err)
 			os.Exit(1)

test/e2e/examples.go

@@ -155,5 +155,9 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() {
 
 func readFile(test, file string) string {
 	from := filepath.Join(test, file)
-	return commonutils.SubstituteImageName(string(testfiles.ReadOrDie(from)))
+	data, err := testfiles.Read(from)
+	if err != nil {
+		framework.Fail(err.Error())
+	}
+	return commonutils.SubstituteImageName(string(data))
 }

test/e2e/framework/ingress/ingress_utils.go

@@ -445,10 +445,18 @@ func NewIngressTestJig(c clientset.Interface) *TestJig {
 func (j *TestJig) CreateIngress(manifestPath, ns string, ingAnnotations map[string]string, svcAnnotations map[string]string) {
 	var err error
 	read := func(file string) string {
-		return string(e2etestfiles.ReadOrDie(filepath.Join(manifestPath, file)))
+		data, err := e2etestfiles.Read(filepath.Join(manifestPath, file))
+		if err != nil {
+			framework.Fail(err.Error())
+		}
+		return string(data)
 	}
 	exists := func(file string) bool {
-		return e2etestfiles.Exists(filepath.Join(manifestPath, file))
+		found, err := e2etestfiles.Exists(filepath.Join(manifestPath, file))
+		if err != nil {
+			framework.Fail(fmt.Sprintf("fatal error looking for test file %s: %s", file, err))
+		}
+		return found
 	}
 
 	j.Logger.Infof("creating replication controller")
@@ -1018,8 +1026,13 @@ func (cont *NginxIngressController) Init() {
 	framework.ExpectNoError(err)
 
 	read := func(file string) string {
-		return string(e2etestfiles.ReadOrDie(filepath.Join(IngressManifestPath, "nginx", file)))
+		data, err := e2etestfiles.Read(filepath.Join(IngressManifestPath, "nginx", file))
+		if err != nil {
+			framework.Fail(err.Error())
+		}
+		return string(data)
 	}
+
 	framework.Logf("initializing nginx ingress controller")
 	framework.RunKubectlOrDieInput(cont.Ns, read("rc.yaml"), "create", "-f", "-", fmt.Sprintf("--namespace=%v", cont.Ns))
 

test/e2e/framework/testfiles/BUILD

@@ -5,7 +5,6 @@ go_library(
     srcs = ["testfiles.go"],
     importpath = "k8s.io/kubernetes/test/e2e/framework/testfiles",
     visibility = ["//visibility:public"],
-    deps = ["//test/e2e/framework:go_default_library"],
 )
 
 filegroup(

test/e2e/framework/testfiles/testfiles.go

@@ -33,8 +33,6 @@ import (
 	"path/filepath"
 	"sort"
 	"strings"
-
-	"k8s.io/kubernetes/test/e2e/framework"
 )
 
 var filesources []FileSource
@@ -66,18 +64,6 @@ type FileSource interface {
 	DescribeFiles() string
 }
 
-// ReadOrDie tries to retrieve the desired file content from
-// one of the registered file sources. In contrast to FileSource, it
-// will either return a valid slice or abort the test by calling the fatal function,
-// i.e. the caller doesn't have to implement error checking.
-func ReadOrDie(filePath string) []byte {
-	data, err := Read(filePath)
-	if err != nil {
-		framework.Fail(err.Error(), 1)
-	}
-	return data
-}
-
 // Read tries to retrieve the desired file content from
 // one of the registered file sources.
 func Read(filePath string) ([]byte, error) {
@@ -106,17 +92,17 @@ func Read(filePath string) ([]byte, error) {
 // Exists checks whether a file could be read. Unexpected errors
 // are handled by calling the fail function, which then should
 // abort the current test.
-func Exists(filePath string) bool {
+func Exists(filePath string) (bool, error) {
 	for _, filesource := range filesources {
 		data, err := filesource.ReadTestFile(filePath)
 		if err != nil {
-			framework.Fail(fmt.Sprintf("fatal error looking for test file %s: %s", filePath, err), 1)
+			return false, err
 		}
 		if data != nil {
-			return true
+			return true, nil
 		}
 	}
-	return false
+	return false, nil
 }
 
 // RootFileSource looks for files relative to a root directory.

test/e2e/kubectl/kubectl.go

@@ -210,7 +210,11 @@ func assertCleanup(ns string, selectors ...string) {
 }
 
 func readTestFileOrDie(file string) []byte {
-	return e2etestfiles.ReadOrDie(path.Join(kubeCtlManifestPath, file))
+	data, err := e2etestfiles.Read(path.Join(kubeCtlManifestPath, file))
+	if err != nil {
+		framework.Fail(err.Error(), 1)
+	}
+	return data
 }
 
 func runKubectlRetryOrDie(ns string, args ...string) string {
@@ -302,7 +306,11 @@ var _ = SIGDescribe("Kubectl client", func() {
 		var nautilus string
 		ginkgo.BeforeEach(func() {
 			updateDemoRoot := "test/fixtures/doc-yaml/user-guide/update-demo"
-			nautilus = commonutils.SubstituteImageName(string(e2etestfiles.ReadOrDie(filepath.Join(updateDemoRoot, "nautilus-rc.yaml.in"))))
+			data, err := e2etestfiles.Read(filepath.Join(updateDemoRoot, "nautilus-rc.yaml.in"))
+			if err != nil {
+				framework.Fail(err.Error())
+			}
+			nautilus = commonutils.SubstituteImageName(string(data))
 		})
 		/*
 			Release : v1.9
@@ -350,7 +358,11 @@ var _ = SIGDescribe("Kubectl client", func() {
 				"agnhost-primary-deployment.yaml.in",
 				"agnhost-replica-deployment.yaml.in",
 			} {
-				contents := commonutils.SubstituteImageName(string(e2etestfiles.ReadOrDie(filepath.Join(guestbookRoot, gbAppFile))))
+				data, err := e2etestfiles.Read(filepath.Join(guestbookRoot, gbAppFile))
+				if err != nil {
+					framework.Fail(err.Error())
+				}
+				contents := commonutils.SubstituteImageName(string(data))
 				run(contents)
 			}
 		}

test/e2e/storage/flexvolume.go

@@ -91,7 +91,10 @@ func installFlex(c clientset.Interface, node *v1.Node, vendor, driver, filePath
 	cmd := fmt.Sprintf("sudo mkdir -p %s", flexDir)
 	sshAndLog(cmd, host, true /*failOnError*/)
 
-	data := e2etestfiles.ReadOrDie(filePath)
+	data, err := e2etestfiles.Read(filePath)
+	if err != nil {
+		framework.Fail(err.Error())
+	}
 	cmd = fmt.Sprintf("sudo tee <<'EOF' %s\n%s\nEOF", flexFile, string(data))
 	sshAndLog(cmd, host, true /*failOnError*/)
 

test/e2e/upgrades/cassandra.go

@@ -60,7 +60,11 @@ func (CassandraUpgradeTest) Skip(upgCtx UpgradeContext) bool {
 }
 
 func cassandraKubectlCreate(ns, file string) {
-	input := string(e2etestfiles.ReadOrDie(filepath.Join(cassandraManifestPath, file)))
+	data, err := e2etestfiles.Read(filepath.Join(cassandraManifestPath, file))
+	if err != nil {
+		framework.Fail(err.Error())
+	}
+	input := string(data)
 	framework.RunKubectlOrDieInput(ns, input, "create", "-f", "-", fmt.Sprintf("--namespace=%s", ns))
 }
 

test/e2e/upgrades/etcd.go

@@ -59,7 +59,11 @@ func (EtcdUpgradeTest) Skip(upgCtx UpgradeContext) bool {
 }
 
 func kubectlCreate(ns, file string) {
-	input := string(e2etestfiles.ReadOrDie(filepath.Join(manifestPath, file)))
+	data, err := e2etestfiles.Read(filepath.Join(manifestPath, file))
+	if err != nil {
+		framework.Fail(err.Error())
+	}
+	input := string(data)
 	framework.RunKubectlOrDieInput(ns, input, "create", "-f", "-", fmt.Sprintf("--namespace=%s", ns))
 }
 

test/e2e/upgrades/mysql.go

@@ -61,7 +61,11 @@ func (MySQLUpgradeTest) Skip(upgCtx UpgradeContext) bool {
 }
 
 func mysqlKubectlCreate(ns, file string) {
-	input := string(e2etestfiles.ReadOrDie(filepath.Join(mysqlManifestPath, file)))
+	data, err := e2etestfiles.Read(filepath.Join(mysqlManifestPath, file))
+	if err != nil {
+		framework.Fail(err.Error())
+	}
+	input := string(data)
 	framework.RunKubectlOrDieInput(ns, input, "create", "-f", "-", fmt.Sprintf("--namespace=%s", ns))
 }