Fixup unit test config paths

tmshort · tmshort · commit 2a27849ab961 · 2025-09-19T10:33:42.000-04:00
Signed-off-by: Todd Short &lt;tshort@redhat.com&gt;
diff --git a/api/v1/clustercatalog_types_test.go b/api/v1/clustercatalog_types_test.go
@@ -20,7 +20,7 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-const crdFilePath = "../../config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml"
+const crdFilePath = "../../helm/olmv1/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml"
 
 func TestImageSourceCELValidationRules(t *testing.T) {
 	validators := fieldValidatorsFromFile(t, crdFilePath)
diff --git a/hack/tools/crd-generator/main_test.go b/hack/tools/crd-generator/main_test.go
@@ -29,22 +29,22 @@ func TestRunGenerator(t *testing.T) {
 	runGenerator(dir, controllerToolsVersion)
 
 	f1 := filepath.Join(dir, "standard/olm.operatorframework.io_clusterextensions.yaml")
-	f2 := "config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml"
+	f2 := "helm/olmv1/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml"
 	fmt.Printf("comparing: %s to %s\n", f1, f2)
 	compareFiles(t, f1, f2)
 
 	f1 = filepath.Join(dir, "standard/olm.operatorframework.io_clustercatalogs.yaml")
-	f2 = "config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml"
+	f2 = "helm/olmv1/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml"
 	fmt.Printf("comparing: %s to %s\n", f1, f2)
 	compareFiles(t, f1, f2)
 
 	f1 = filepath.Join(dir, "experimental/olm.operatorframework.io_clusterextensions.yaml")
-	f2 = "config/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml"
+	f2 = "helm/olmv1/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml"
 	fmt.Printf("comparing: %s to %s\n", f1, f2)
 	compareFiles(t, f1, f2)
 
 	f1 = filepath.Join(dir, "experimental/olm.operatorframework.io_clustercatalogs.yaml")
-	f2 = "config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml"
+	f2 = "helm/olmv1/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml"
 	fmt.Printf("comparing: %s to %s\n", f1, f2)
 	compareFiles(t, f1, f2)
 }
diff --git a/internal/operator-controller/controllers/suite_test.go b/internal/operator-controller/controllers/suite_test.go
@@ -95,7 +95,7 @@ var config *rest.Config
 func TestMain(m *testing.M) {
 	testEnv := &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join("..", "..", "..", "config", "base", "operator-controller", "crd", "experimental"),
+			filepath.Join("..", "..", "..", "helm", "olmv1", "base", "operator-controller", "crd", "experimental"),
 		},
 		ErrorIfCRDPathMissing: true,
 	}

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"sigs.k8s.io/yaml"`
`21`	`21`	`)`
`22`	`22`
`23`		`-const crdFilePath = "../../config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml"`
	`23`	`+const crdFilePath = "../../helm/olmv1/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml"`
`24`	`24`
`25`	`25`	`func TestImageSourceCELValidationRules(t *testing.T) {`
`26`	`26`	`validators := fieldValidatorsFromFile(t, crdFilePath)`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ var config *rest.Config`
`95`	`95`	`func TestMain(m *testing.M) {`
`96`	`96`	`testEnv := &envtest.Environment{`
`97`	`97`	`CRDDirectoryPaths: []string{`
`98`		`- filepath.Join("..", "..", "..", "config", "base", "operator-controller", "crd", "experimental"),`
	`98`	`+ filepath.Join("..", "..", "..", "helm", "olmv1", "base", "operator-controller", "crd", "experimental"),`
`99`	`99`	`},`
`100`	`100`	`ErrorIfCRDPathMissing: true,`
`101`	`101`	`}`