Merge pull request #16857 from bparees/relocated_testdata

Automatic merge from submit-queue (batch tested with PRs 16818, 16857).

move build testdata files into builds subdirs

Author: openshift-merge-robot

test/cmd/builds.sh

@@ -119,7 +119,7 @@ os::cmd::expect_failure_and_text "oc start-build ruby-sample-build-invalid-tag -
 os::cmd::expect_failure_and_text "oc start-build ruby-sample-build-invalid-tag --from-file=. --from-build=${started}" "Cannot use '--from-build' flag with binary builds"
 os::cmd::expect_failure_and_text "oc start-build ruby-sample-build-invalid-tag --from-repo=. --from-build=${started}" "Cannot use '--from-build' flag with binary builds"
 # --incremental flag should override Spec.Strategy.SourceStrategy.Incremental
-os::cmd::expect_success 'oc create -f test/extended/testdata/test-s2i-build.json'
+os::cmd::expect_success 'oc create -f test/extended/testdata/builds/test-s2i-build.json'
 build_name="$(oc start-build -o=name test)"
 os::cmd::expect_success_and_not_text "oc describe ${build_name}" 'Incremental Build'
 build_name="$(oc start-build -o=name --incremental test)"
@@ -136,7 +136,7 @@ build_name="$(oc start-build -o=name --incremental test)"
 os::cmd::expect_success_and_text "oc describe ${build_name}" 'Incremental Build'
 os::cmd::expect_success 'oc delete all --selector="name=test"'
 # --no-cache flag should override Spec.Strategy.SourceStrategy.NoCache
-os::cmd::expect_success 'oc create -f test/extended/testdata/test-docker-build.json'
+os::cmd::expect_success 'oc create -f test/extended/testdata/builds/test-docker-build.json'
 build_name="$(oc start-build -o=name test)"
 os::cmd::expect_success_and_not_text "oc describe ${build_name}" 'No Cache'
 build_name="$(oc start-build -o=name --no-cache test)"

test/extended/builds/build_pruning.go

@@ -20,7 +20,7 @@ import (
 // function using cached information from the buildLister.
 var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in the buildconfig", func() {
 	var (
-		buildPruningBaseDir   = exutil.FixturePath("testdata", "build-pruning")
+		buildPruningBaseDir   = exutil.FixturePath("testdata", "builds", "build-pruning")
 		isFixture             = filepath.Join(buildPruningBaseDir, "imagestream.yaml")
 		successfulBuildConfig = filepath.Join(buildPruningBaseDir, "successful-build-config.yaml")
 		failedBuildConfig     = filepath.Join(buildPruningBaseDir, "failed-build-config.yaml")

test/extended/builds/build_timing.go

@@ -28,7 +28,7 @@ func verifyStages(stages []buildapi.StageInfo, expectedStages map[string][]strin
 
 var _ = g.Describe("[Feature:Builds][timing] capture build stages and durations", func() {
 	var (
-		buildTimingBaseDir    = exutil.FixturePath("testdata", "build-timing")
+		buildTimingBaseDir    = exutil.FixturePath("testdata", "builds", "build-timing")
 		isFixture             = filepath.Join(buildTimingBaseDir, "test-is.json")
 		dockerBuildFixture    = filepath.Join(buildTimingBaseDir, "test-docker-build.json")
 		dockerBuildDockerfile = filepath.Join(buildTimingBaseDir, "Dockerfile")

test/extended/builds/buildconfigsecretinjector.go

@@ -11,7 +11,7 @@ var _ = g.Describe("[Feature:Builds] buildconfig secret injector", func() {
 	defer g.GinkgoRecover()
 
 	var (
-		itemsPath = exutil.FixturePath("testdata", "test-buildconfigsecretinjector.yaml")
+		itemsPath = exutil.FixturePath("testdata", "builds", "test-buildconfigsecretinjector.yaml")
 		oc        = exutil.NewCLI("buildconfigsecretinjector", exutil.KubeConfigPath())
 	)
 

test/extended/builds/completiondeadlineseconds.go

@@ -14,8 +14,8 @@ import (
 var _ = g.Describe("[Feature:Builds][Slow] builds should have deadlines", func() {
 	defer g.GinkgoRecover()
 	var (
-		sourceFixture = exutil.FixturePath("testdata", "test-cds-sourcebuild.json")
-		dockerFixture = exutil.FixturePath("testdata", "test-cds-dockerbuild.json")
+		sourceFixture = exutil.FixturePath("testdata", "builds", "test-cds-sourcebuild.json")
+		dockerFixture = exutil.FixturePath("testdata", "builds", "test-cds-dockerbuild.json")
 		oc            = exutil.NewCLI("cli-start-build", exutil.KubeConfigPath())
 	)
 

test/extended/builds/contextdir.go

@@ -17,7 +17,7 @@ import (
 var _ = g.Describe("[Feature:Builds][Slow] builds with a context directory", func() {
 	defer g.GinkgoRecover()
 	var (
-		appFixture            = exutil.FixturePath("testdata", "test-context-build.json")
+		appFixture            = exutil.FixturePath("testdata", "builds", "test-context-build.json")
 		oc                    = exutil.NewCLI("contextdir", exutil.KubeConfigPath())
 		s2iBuildConfigName    = "s2icontext"
 		s2iBuildName          = "s2icontext-1"

test/extended/builds/digest.go

@@ -14,8 +14,8 @@ var _ = g.Describe("[Feature:Builds][Slow] completed builds should have digest o
 	defer g.GinkgoRecover()
 	var (
 		imageStreamFixture = exutil.FixturePath("..", "integration", "testdata", "test-image-stream.json")
-		stiBuildFixture    = exutil.FixturePath("testdata", "test-s2i-build.json")
-		dockerBuildFixture = exutil.FixturePath("testdata", "test-docker-build.json")
+		stiBuildFixture    = exutil.FixturePath("testdata", "builds", "test-s2i-build.json")
+		dockerBuildFixture = exutil.FixturePath("testdata", "builds", "test-docker-build.json")
 		oc                 = exutil.NewCLI("build-sti-labels", exutil.KubeConfigPath())
 	)
 

test/extended/builds/docker_pullsecret.go

@@ -17,7 +17,7 @@ var _ = g.Describe("[Feature:Builds][pullsecret][Conformance] docker build using
 	)
 
 	var (
-		buildFixture = exutil.FixturePath("testdata", "test-docker-build-pullsecret.json")
+		buildFixture = exutil.FixturePath("testdata", "builds", "test-docker-build-pullsecret.json")
 		oc           = exutil.NewCLI("docker-build-pullsecret", exutil.KubeConfigPath())
 	)
 

test/extended/builds/docker_quota.go

@@ -19,7 +19,7 @@ var _ = g.Describe("[Feature:Builds][quota][Slow] docker build with a quota", fu
 	)
 
 	var (
-		buildFixture = exutil.FixturePath("testdata", "test-docker-build-quota.json")
+		buildFixture = exutil.FixturePath("testdata", "builds", "test-docker-build-quota.json")
 		oc           = exutil.NewCLI("docker-build-quota", exutil.KubeConfigPath())
 	)
 	g.Context("", func() {
@@ -46,7 +46,7 @@ var _ = g.Describe("[Feature:Builds][quota][Slow] docker build with a quota", fu
 				o.Expect(err).NotTo(o.HaveOccurred())
 
 				g.By("starting a test build")
-				path := exutil.FixturePath("testdata", "build-quota")
+				path := exutil.FixturePath("testdata", "builds", "build-quota")
 				o.Expect(os.Chmod(filepath.Join(path, ".s2i", "bin", "assemble"), 0755)).NotTo(o.HaveOccurred())
 				br, err := exutil.StartBuildAndWait(oc, "docker-build-quota", "--from-dir", path)
 

test/extended/builds/failure_status.go

@@ -23,15 +23,15 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
 		// convert the s2i failure cases to our own StatusReason
 		reasonAssembleFailed  = buildapi.StatusReason(s2istatus.ReasonAssembleFailed)
 		messageAssembleFailed = string(s2istatus.ReasonMessageAssembleFailed)
-		postCommitHookFixture = exutil.FixturePath("testdata", "statusfail-postcommithook.yaml")
-		fetchDockerSrc        = exutil.FixturePath("testdata", "statusfail-fetchsourcedocker.yaml")
-		fetchS2ISrc           = exutil.FixturePath("testdata", "statusfail-fetchsources2i.yaml")
-		badContextDirS2ISrc   = exutil.FixturePath("testdata", "statusfail-badcontextdirs2i.yaml")
-		builderImageFixture   = exutil.FixturePath("testdata", "statusfail-fetchbuilderimage.yaml")
-		pushToRegistryFixture = exutil.FixturePath("testdata", "statusfail-pushtoregistry.yaml")
-		failedAssembleFixture = exutil.FixturePath("testdata", "statusfail-failedassemble.yaml")
-		failedGenericReason   = exutil.FixturePath("testdata", "statusfail-genericreason.yaml")
-		binaryBuildDir        = exutil.FixturePath("testdata", "statusfail-assemble")
+		postCommitHookFixture = exutil.FixturePath("testdata", "builds", "statusfail-postcommithook.yaml")
+		fetchDockerSrc        = exutil.FixturePath("testdata", "builds", "statusfail-fetchsourcedocker.yaml")
+		fetchS2ISrc           = exutil.FixturePath("testdata", "builds", "statusfail-fetchsources2i.yaml")
+		badContextDirS2ISrc   = exutil.FixturePath("testdata", "builds", "statusfail-badcontextdirs2i.yaml")
+		builderImageFixture   = exutil.FixturePath("testdata", "builds", "statusfail-fetchbuilderimage.yaml")
+		pushToRegistryFixture = exutil.FixturePath("testdata", "builds", "statusfail-pushtoregistry.yaml")
+		failedAssembleFixture = exutil.FixturePath("testdata", "builds", "statusfail-failedassemble.yaml")
+		failedGenericReason   = exutil.FixturePath("testdata", "builds", "statusfail-genericreason.yaml")
+		binaryBuildDir        = exutil.FixturePath("testdata", "builds", "statusfail-assemble")
 		oc                    = exutil.NewCLI("update-buildstatus", exutil.KubeConfigPath())
 	)
 
@@ -75,12 +75,12 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
 					if err != nil {
 						return true, err
 					}
-					if build.Status.CompletionTimestamp != nil {
+					if len(build.Status.LogSnippet) != 0 {
 						return true, nil
 					}
 					return false, nil
 				})
-				o.Expect(err).NotTo(o.HaveOccurred())
+				o.Expect(err).NotTo(o.HaveOccurred(), "Should not get an error or timeout getting LogSnippet")
 				o.Expect(len(build.Status.LogSnippet)).NotTo(o.Equal(0), "LogSnippet should be set to something for failed builds")
 			})
 		})